From: Date: August 20 2008 8:35pm
Subject: bzr commit into mysql-6.0 branch (mattiasj:2792) Bug#34604
List-Archive: http://lists.mysql.com/commits/52083
X-Bug: 34604
Message-Id: <20080820183512.511FDF85B80@witty.localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/mattiasj/clones/bzrroot/pushfix-60-bugteam/

 2792 Mattias Jonsson	2008-08-20
      pre push fix of test case for bug#34604
      (needed change in 6.0 from 5.1)
modified:
  mysql-test/suite/parts/r/partition_special_innodb.result
  mysql-test/suite/parts/t/partition_special_innodb.test

per-file messages:
  mysql-test/suite/parts/r/partition_special_innodb.result
    Bug#34604: Assert in ha_rnd_end inited==RND failed
    
    updated test case for 6.0
  mysql-test/suite/parts/t/partition_special_innodb.test
    Bug#34604: Assert in ha_rnd_end inited==RND failed
    
    updated test case for 6.0
=== modified file 'mysql-test/suite/parts/r/partition_special_innodb.result'
--- a/mysql-test/suite/parts/r/partition_special_innodb.result	2008-08-20 15:29:14 +0000
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result	2008-08-20 18:34:53 +0000
@@ -193,5 +193,6 @@ START TRANSACTION;
 INSERT INTO t1 VALUES (NULL, 'first row t2');
 SET autocommit=OFF;
 ALTER TABLE t1 AUTO_INCREMENT = 10;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 INSERT INTO t1 VALUES (NULL, 'second row t2');
 DROP TABLE t1;

=== modified file 'mysql-test/suite/parts/t/partition_special_innodb.test'
--- a/mysql-test/suite/parts/t/partition_special_innodb.test	2008-08-20 15:29:14 +0000
+++ b/mysql-test/suite/parts/t/partition_special_innodb.test	2008-08-20 18:34:53 +0000
@@ -68,6 +68,7 @@ INSERT INTO t1 VALUES (NULL, 'first row 
 
 --connection con2
 SET autocommit=OFF;
+--error ER_LOCK_WAIT_TIMEOUT
 ALTER TABLE t1 AUTO_INCREMENT = 10;
 
 --connection con1