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

MDEV-31586 Make the MDEV-31463 test more fitting and stable

Browse Source 
The original test in the report of MDEV-31463 is contrived and
nondeterministic, causing MDEV-31586. We update the test to make it
more directly addresses the underlying cause of MDEV-31463, namely
errors from queries sent to the data node not consumed when trying to
set lock wait timeout. This is achieved through the debug sync
facility.
This commit is contained in:
Yuchen Pei
2023-07-31 14:49:01 +10:00
parent baf00fc553
commit 0254eb9307
4 changed files with 87 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/spider/spd_db_mysql.cc
View File

@@ -13429,7 +13429,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 =
@@ -13437,6 +13437,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;