From affdd53394fc7644f03963f1ed4b1abcdb164a43 Mon Sep 17 00:00:00 2001 From: Jon Olav Hauglid Date: Thu, 11 Feb 2010 12:59:12 +0100 Subject: [PATCH] Followup to Bug#34604 handler::ha_rnd_end(): Assertion `inited==RND' failed. The test case for this bug relies on getting a ER_LOCK_WAIT_TIMEOUT error. However with the introduction of MDL, the test would hang forever since the metadata locks would not timeout. MDL timeouts are now introduced in the scope of Bug#45225. This patch changes the testcase for Bug#34604 to set the new server variable "lock_wait_timeout" to one second which makes the test generate the necessary timeout again. --- mysql-test/suite/parts/r/partition_special_innodb.result | 1 + mysql-test/suite/parts/t/partition_special_innodb.test | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/suite/parts/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result index 3c64c5c3ca4..a9c5b2e766e 100644 --- a/mysql-test/suite/parts/r/partition_special_innodb.result +++ b/mysql-test/suite/parts/r/partition_special_innodb.result @@ -212,6 +212,7 @@ SET autocommit=OFF; START TRANSACTION; INSERT INTO t1 VALUES (NULL, 'first row t2'); SET autocommit=OFF; +SET SESSION lock_wait_timeout= 1; ALTER TABLE t1 AUTO_INCREMENT = 10; ERROR HY000: Lock wait timeout exceeded; try restarting transaction DROP TABLE t1; diff --git a/mysql-test/suite/parts/t/partition_special_innodb.test b/mysql-test/suite/parts/t/partition_special_innodb.test index 7583f953b32..833e489558e 100644 --- a/mysql-test/suite/parts/t/partition_special_innodb.test +++ b/mysql-test/suite/parts/t/partition_special_innodb.test @@ -68,6 +68,7 @@ INSERT INTO t1 VALUES (NULL, 'first row t2'); --connection con2 SET autocommit=OFF; +SET SESSION lock_wait_timeout= 1; --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE t1 AUTO_INCREMENT = 10;