Added larger timeout to backup_stages.test

MDEV-21546 main.backup_stages occasionally fails with lock wait timeout
MariaDB · Jun 2, 2020 · 457e312 · 457e312
1 parent f1c35a9
commit 457e312
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mysql-test/main/backup_stages.result b/mysql-test/main/backup_stages.result
@@ -63,7 +63,7 @@ INSERT INTO t_permanent_myisam SET col1 = 1;
 connect backup,localhost,root,,;
 connect con11,localhost,root,,;
 SET AUTOCOMMIT = 0;
-set session lock_wait_timeout=0;
+set session lock_wait_timeout=1;
 connect con12,localhost,root,,;
 SET AUTOCOMMIT = 1;
 # Between (connection default) BACKUP STAGE START and FLUSH
@@ -208,7 +208,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 DROP TABLE t_con1_myisam;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 connection con12;
-SET STATEMENT lock_wait_timeout=0 FOR UPDATE t_permanent_innodb SET col1 = 9;
+SET STATEMENT lock_wait_timeout=1 FOR UPDATE t_permanent_innodb SET col1 = 9;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 connection backup;
 BACKUP STAGE END;

diff --git a/mysql-test/main/backup_stages.test b/mysql-test/main/backup_stages.test
@@ -119,7 +119,7 @@ INSERT INTO t_permanent_myisam SET col1 = 1;
 --connect(backup,localhost,root,,)
 --connect(con11,localhost,root,,)
 SET AUTOCOMMIT = 0;
-set session lock_wait_timeout=0;
+set session lock_wait_timeout=1;
 --connect(con12,localhost,root,,)
 SET AUTOCOMMIT = 1;
 
@@ -244,7 +244,7 @@ DROP TABLE t_con1_innodb;
 DROP TABLE t_con1_myisam;
 --connection con12
 --error ER_LOCK_WAIT_TIMEOUT
-SET STATEMENT lock_wait_timeout=0 FOR UPDATE t_permanent_innodb SET col1 = 9;
+SET STATEMENT lock_wait_timeout=1 FOR UPDATE t_permanent_innodb SET col1 = 9;
 
 --connection backup
 BACKUP STAGE END;