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 /mysql-test/suite/galera/r/galera_split_brain.result | |
| 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 'mysql-test/suite/galera/r/galera_split_brain.result')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_split_brain.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/r/galera_split_brain.result b/mysql-test/suite/galera/r/galera_split_brain.result index bd8c3a5bc44..08f9060d2a9 100644 --- a/mysql-test/suite/galera/r/galera_split_brain.result +++ b/mysql-test/suite/galera/r/galera_split_brain.result @@ -7,8 +7,9 @@ connection node_1; connection node_2; Killing server ... connection node_1; +SET SESSION lock_wait_timeout= 3; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +ERROR HY000: Lock wait timeout exceeded; try restarting transaction connection node_2; connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; disconnect node_2; |