database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '11.0' into 11.1

Browse Source
This commit is contained in:
Sergei Golubchik
2023-09-24 01:46:43 +02:00
parent e6ec2b3b52 9880006b5b
commit f031889ae4
82 changed files with 2519 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/spider/spd_db_mysql.cc
View File

@@ -13372,7 +13372,7 @@ int spider_mbase_handler::sts_mode_exchange(
static int spider_set_lock_wait_timeout(uint seconds, SPIDER_CONN *conn,
int *need_mon)
{
char query[512];;
char query[512];
int error_num;
DBUG_ENTER("spider_db_set_lock_wait_timeout");
size_t query_len =
@@ -13380,6 +13380,7 @@ static int spider_set_lock_wait_timeout(uint seconds, SPIDER_CONN *conn,
"set @old_lock_wait_timeout=@@session.lock_wait_timeout;"
"set session lock_wait_timeout=%d;",
seconds);
DEBUG_SYNC(conn->thd, "spider_set_lock_wait_timeout_before_query");
if (spider_db_query(conn, query, query_len, -1, need_mon))
DBUG_RETURN(spider_db_errorno(conn));
spider_db_result *result;