diff options
| author | Leandro Pacheco <leandro.pacheco@galeracluster.com> | 2021-08-13 14:19:29 -0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-08-18 08:57:33 +0300 |
| commit | 112b23969a30ba6441efa5e22a3017435febfa17 (patch) | |
| tree | b5936cd4264df9d0c0c8b2c140432e67ff546ed2 /sql/sql_parse.cc | |
| parent | dc58303cf8a7d0884d44cac54772b0aa506b6e6a (diff) | |
| download | mariadb-git-112b23969a30ba6441efa5e22a3017435febfa17.tar.gz | |
MDEV-26308 : Galera test failure on galera.galera_split_brain
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>
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9e78a1a95e2..8999397fee7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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 |