List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:February 11 2010 11:59am
Subject:bzr commit into mysql-5.5-next-mr branch (jon.hauglid:3091) Bug#34604
View as plain text  
#At file:///export/home/z/mysql-next-4284-mytest/ based on revid:jon.hauglid@stripped

 3091 Jon Olav Hauglid	2010-02-11
      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.

    modified:
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/t/partition_special_innodb.test
=== modified file 'mysql-test/suite/parts/r/partition_special_innodb.result'
--- a/mysql-test/suite/parts/r/partition_special_innodb.result	2009-12-08 07:39:49 +0000
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result	2010-02-11 11:59:12 +0000
@@ -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;

=== modified file 'mysql-test/suite/parts/t/partition_special_innodb.test'
--- a/mysql-test/suite/parts/t/partition_special_innodb.test	2009-12-08 07:39:49 +0000
+++ b/mysql-test/suite/parts/t/partition_special_innodb.test	2010-02-11 11:59:12 +0000
@@ -68,6 +68,7 @@ INSERT INTO t1 VALUES (NULL, 'first row 
 
 --connection con2
 SET autocommit=OFF;
+SET SESSION lock_wait_timeout= 1;
 --error ER_LOCK_WAIT_TIMEOUT
 ALTER TABLE t1 AUTO_INCREMENT = 10;
 


Attachment: [text/bzr-bundle] bzr/jon.hauglid@sun.com-20100211115912-iqjq2h132it9iyvw.bundle
Thread
bzr commit into mysql-5.5-next-mr branch (jon.hauglid:3091) Bug#34604Jon Olav Hauglid11 Feb