From ce1c957ab1021aabef4adbb22d1b7a155e4232ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 1 Jul 2021 10:04:47 +0300 Subject: [PATCH] Speed up the test innodb.lock_insert_into_empty Let us use innodb_lock_wait_timeout=0 for an immediate timeout. Also, do not override the timeout in the default connection, so that further tests will use the default setting. --- .../suite/innodb/r/lock_insert_into_empty.result | 13 ++++++++----- .../suite/innodb/t/lock_insert_into_empty.test | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/innodb/r/lock_insert_into_empty.result b/mysql-test/suite/innodb/r/lock_insert_into_empty.result index b5e7ecf6311..c1dea2fc9af 100644 --- a/mysql-test/suite/innodb/r/lock_insert_into_empty.result +++ b/mysql-test/suite/innodb/r/lock_insert_into_empty.result @@ -5,17 +5,20 @@ BEGIN; DELETE FROM t1; INSERT INTO t2 VALUES(1),(1); ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -connect con1,localhost,root,,; BEGIN; SELECT * FROM t2 LOCK IN SHARE MODE; a -connection default; -SET innodb_lock_wait_timeout=1; +connect con1,localhost,root,,; +SET innodb_lock_wait_timeout=0; INSERT INTO t2 VALUES(2); ERROR HY000: Lock wait timeout exceeded; try restarting transaction -disconnect con1; +connection default; +ROLLBACK; +connection con1; INSERT INTO t2 VALUES(3); COMMIT; +disconnect con1; +connection default; SELECT * FROM t1; a SELECT * FROM t2; @@ -45,7 +48,7 @@ INSERT INTO t1 SET k=1; START TRANSACTION; INSERT INTO t1 SET k=2; connect con1,localhost,root,,test; -SET innodb_lock_wait_timeout= 1; +SET innodb_lock_wait_timeout=0; CREATE TABLE t2 (pk INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB AS SELECT k FROM t1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction diff --git a/mysql-test/suite/innodb/t/lock_insert_into_empty.test b/mysql-test/suite/innodb/t/lock_insert_into_empty.test index cc2b169a52e..91d2bcdd3ba 100644 --- a/mysql-test/suite/innodb/t/lock_insert_into_empty.test +++ b/mysql-test/suite/innodb/t/lock_insert_into_empty.test @@ -9,17 +9,20 @@ DELETE FROM t1; --error ER_DUP_ENTRY INSERT INTO t2 VALUES(1),(1); -connect (con1,localhost,root,,); BEGIN; SELECT * FROM t2 LOCK IN SHARE MODE; -connection default; -SET innodb_lock_wait_timeout=1; +connect (con1,localhost,root,,); +SET innodb_lock_wait_timeout=0; --error ER_LOCK_WAIT_TIMEOUT INSERT INTO t2 VALUES(2); -disconnect con1; +connection default; +ROLLBACK; +connection con1; INSERT INTO t2 VALUES(3); COMMIT; +disconnect con1; +connection default; SELECT * FROM t1; SELECT * FROM t2; @@ -50,7 +53,7 @@ START TRANSACTION; INSERT INTO t1 SET k=2; --connect (con1,localhost,root,,test) -SET innodb_lock_wait_timeout= 1; +SET innodb_lock_wait_timeout=0; --error ER_LOCK_WAIT_TIMEOUT CREATE TABLE t2 (pk INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB AS SELECT k FROM t1;