database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-26308 : Galera test failure on galera.galera_split_brain

Browse Source 
Contains following fixes:

* allow TOI commands to timeout while trying to acquire TOI with
override lock_wait_timeout with a LONG_TIMEOUT only after
succesfully entering TOI
* only ignore lock_wait_timeout on TOI
* fix galera_split_brain test as TOI operation now returns ER_LOCK_WAIT_TIMEOUT after lock_wait_timeout
* explicitly test for TOI

Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
This commit is contained in:
Leandro Pacheco
2021-08-13 14:19:29 -03:00
committed by Jan Lindström
parent dc58303cf8
commit 112b23969a
11 changed files with 63 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -7845,7 +7845,7 @@ static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
});
WSREP_DEBUG("wsrep retrying AC query: %lu %s",
thd->wsrep_retry_counter, WSREP_QUERY(thd));
thd->wsrep_retry_counter, wsrep_thd_query(thd));
wsrep_prepare_for_autocommit_retry(thd, rawbuf, length, parser_state);
if (thd->lex->explain)
delete_explain_query(thd->lex);
@ -7859,7 +7859,7 @@ static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
is_autocommit,
thd->wsrep_retry_counter,
thd->variables.wsrep_retry_autocommit,
WSREP_QUERY(thd));
wsrep_thd_query(thd));
my_error(ER_LOCK_DEADLOCK, MYF(0));
thd->reset_kill_query();
thd->wsrep_retry_counter= 0; // reset