bzr commit into mysql-trunk branch (marko.makela:3232)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ based on revid:vasil.dimov@stripped7c0kg3z4b8vo

 3232 Marko Mäkelä	2011-06-23 [merge]
      Merge mysql-5.5 to mysql-trunk.

    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:vasil.dimov@stripped
+++ b/mysql-test/suite/innodb/r/innodb-index.result	revid:marko.makela@stripped
@@ -1086,7 +1086,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:vasil.dimov@stripped10623064848-cdjl7c0kg3z4b8vo
+++ b/mysql-test/suite/innodb/t/innodb-index.test	revid:marko.makela@stripped623095141-379yy9lk2mt6x30y
@@ -519,7 +519,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/[e-mail]