Commit d09b999f authored by Marko Mäkelä's avatar Marko Mäkelä

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;
parent af5c95c2
...@@ -1087,7 +1087,8 @@ DROP TABLE t2; ...@@ -1087,7 +1087,8 @@ DROP TABLE t2;
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB; CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e'); 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; BEGIN;
SELECT * FROM t1; SELECT * FROM t1;
a b a b
......
...@@ -521,7 +521,8 @@ connect (b,localhost,root,,); ...@@ -521,7 +521,8 @@ connect (b,localhost,root,,);
connection a; connection a;
CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB; CREATE TABLE t1 (a INT, b CHAR(1)) ENGINE=InnoDB;
INSERT INTO t1 VALUES (3,'a'),(3,'b'),(1,'c'),(0,'d'),(1,'e'); 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; connection b;
BEGIN; BEGIN;
# This acquires a MDL lock on t1 until commit. # This acquires a MDL lock on t1 until commit.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment