summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2022-02-17 18:17:05 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2022-02-17 18:25:32 +0100
commit4e667b96389a0d77836770b05d78110caec66f9d (patch)
treeefb5a514bc9c9de01e941a81919354e0218f10cc
parent73c391afc5f9315658e0486a375dbce2d109b9b5 (diff)
downloadmariadb-git-4e667b96389a0d77836770b05d78110caec66f9d.tar.gz
MDEV-27877 considerably speed up innodb_force_recovery test
decrease innodb_lock_wait_timeout for the current session.
-rw-r--r--mysql-test/suite/innodb/r/innodb_force_recovery.result2
-rw-r--r--mysql-test/suite/innodb/t/innodb_force_recovery.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_force_recovery.result b/mysql-test/suite/innodb/r/innodb_force_recovery.result
index 8e700f9489d..38892e4c838 100644
--- a/mysql-test/suite/innodb/r/innodb_force_recovery.result
+++ b/mysql-test/suite/innodb/r/innodb_force_recovery.result
@@ -113,7 +113,7 @@ SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
select * from t2;
f1 f2
1 2
-SET GLOBAL innodb_lock_wait_timeout=1;
+SET SESSION innodb_lock_wait_timeout=1;
insert into t2 values(1,2);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
insert into t2 values(9,10);
diff --git a/mysql-test/suite/innodb/t/innodb_force_recovery.test b/mysql-test/suite/innodb/t/innodb_force_recovery.test
index 9d7cf9d80b7..b8b8cc9c900 100644
--- a/mysql-test/suite/innodb/t/innodb_force_recovery.test
+++ b/mysql-test/suite/innodb/t/innodb_force_recovery.test
@@ -162,7 +162,7 @@ SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
select * from t2;
SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
select * from t2;
-SET GLOBAL innodb_lock_wait_timeout=1;
+SET SESSION innodb_lock_wait_timeout=1;
--error ER_LOCK_WAIT_TIMEOUT
insert into t2 values(1,2);
insert into t2 values(9,10);