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_insert.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_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e04062d66d5..cbd815eb8fd 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2019, MariaDB Corporation + Copyright (c) 2010, 2021, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4782,7 +4782,7 @@ bool select_create::send_eof() { WSREP_DEBUG("select_create commit failed, thd: %llu err: %s %s", thd->thread_id, - wsrep_thd_transaction_state_str(thd), WSREP_QUERY(thd)); + wsrep_thd_transaction_state_str(thd), wsrep_thd_query(thd)); mysql_mutex_unlock(&thd->LOCK_thd_data); abort_result_set(); DBUG_RETURN(true); |