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/wsrep_var.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/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index e4cfd0d89c9..cd7b9bdf870 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -1,4 +1,4 @@ -/* Copyright 2008-2015 Codership Oy <http://www.codership.com> +/* Copyright 2008-2021 Codership Oy <http://www.codership.com> 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 @@ -794,7 +794,7 @@ bool wsrep_desync_check (sys_var *self, THD* thd, set_var* var) ret= Wsrep_server_state::instance().provider().desync(); if (ret) { WSREP_WARN ("SET desync failed %d for schema: %s, query: %s", ret, - thd->db.str, WSREP_QUERY(thd)); + thd->db.str, wsrep_thd_query(thd)); my_error (ER_CANNOT_USER, MYF(0), "'desync'", thd->query()); return true; } |