List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 23 2011 9:40am
Subject:bzr commit into mysql-5.5 branch (marko.makela:3467) Bug#11753728
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ based on revid:guilhem.bichot@strippedb516dgjqt1rcq

 3467 Marko Mäkelä	2011-06-23
      Bug#11753728 45225: Locking: hang if drop table with no timeout
      
      Fix a failure of the re-enabled innodb-index.test in the embedded server.
      Apparently, the embedded server does not default to ENGINE=InnoDB when
      copying an InnoDB table by CREATE TABLE t2 SELECT * FROM t1;

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
=== modified file 'mysql-test/suite/innodb/r/innodb-index.result'
--- a/mysql-test/suite/innodb/r/innodb-index.result	revid:guilhem.bichot@stripped37-b05b516dgjqt1rcq
+++ b/mysql-test/suite/innodb/r/innodb-index.result	revid:marko.makela@stripped19-ed27kvpj7l27i0ru
@@ -1087,7 +1087,8 @@ DROP TABLE t2;
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e');
-CREATE TABLE t2 SELECT * FROM t1;
+CREATE TABLE t2 (a INT, b CHAR(1)) ENGINE=InnoDB;
+INSERT INTO t2 SELECT * FROM t1;
 BEGIN;
 SELECT * FROM t1;
 a	b

=== modified file 'mysql-test/suite/innodb/t/innodb-index.test'
--- a/mysql-test/suite/innodb/t/innodb-index.test	revid:guilhem.bichot@strippedt1rcq
+++ b/mysql-test/suite/innodb/t/innodb-index.test	revid:marko.makela@stripped0ru
@@ -521,7 +521,8 @@ connect (b,localhost,root,,);
 connection a;
 CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e');
-CREATE TABLE t2 SELECT * FROM t1;
+CREATE TABLE t2 (a INT, b CHAR(1)) ENGINE=InnoDB;
+INSERT INTO t2 SELECT * FROM t1;
 connection b;
 BEGIN;
 # This acquires a MDL lock on t1 until commit.

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20110623094019-ed27kvpj7l27i0ru.bundle
Thread
bzr commit into mysql-5.5 branch (marko.makela:3467) Bug#11753728marko.makela23 Jun