diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-26 08:46:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-26 08:46:57 +0300 |
| commit | 87ff4ba7c874ccb8a5b1105571569a94ca959d53 (patch) | |
| tree | a3dfd317697d7f698c5c5e3e3d7b3a7a3b4d181a /mysql-test/suite | |
| parent | bd3eb528512dfbb99a57033ff3bf7e09069c0d4e (diff) | |
| parent | dc6bc85cd29586631d927036451d955c7013206c (diff) | |
| download | mariadb-git-87ff4ba7c874ccb8a5b1105571569a94ca959d53.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_split_brain.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_split_brain.test | 3 |
2 files changed, 4 insertions, 2 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; diff --git a/mysql-test/suite/galera/t/galera_split_brain.test b/mysql-test/suite/galera/t/galera_split_brain.test index 6a822b8f127..ccdfd3fd506 100644 --- a/mysql-test/suite/galera/t/galera_split_brain.test +++ b/mysql-test/suite/galera/t/galera_split_brain.test @@ -22,7 +22,8 @@ call mtr.add_suppression("WSREP: TO isolation failed for: "); --source include/kill_galera.inc --connection node_1 ---error ER_LOCK_DEADLOCK +SET SESSION lock_wait_timeout= 3; +--error ER_LOCK_WAIT_TIMEOUT CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; # Reset the master and restart the slave so that post-test checks can run |