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

MDEV-16678 followup: Adjust the test main.mdl

We must prevent InnoDB purge from acquiring MDL on the tables.
Since MDEV-12288, INSERT is generating work for purge.
parent 30e7a0a8
...@@ -58,6 +58,8 @@ DROP TABLE t1,t3; ...@@ -58,6 +58,8 @@ DROP TABLE t1,t3;
# #
CREATE TABLE t1(a INT) ENGINE=InnoDB; CREATE TABLE t1(a INT) ENGINE=InnoDB;
CREATE TABLE t3(a INT) ENGINE=myisam; CREATE TABLE t3(a INT) ENGINE=myisam;
connect purge_control,localhost,root,,;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connect locker,localhost,root,,; connect locker,localhost,root,,;
connection default; connection default;
FLUSH TABLES WITH READ LOCK; FLUSH TABLES WITH READ LOCK;
...@@ -85,6 +87,7 @@ MDL_SHARED_WRITE Table metadata lock test t3 ...@@ -85,6 +87,7 @@ MDL_SHARED_WRITE Table metadata lock test t3
unlock tables; unlock tables;
connection locker; connection locker;
unlock tables; unlock tables;
disconnect purge_control;
connection default; connection default;
disconnect locker; disconnect locker;
DROP TABLE t1,t3; DROP TABLE t1,t3;
...@@ -40,6 +40,8 @@ DROP TABLE t1,t3; ...@@ -40,6 +40,8 @@ DROP TABLE t1,t3;
CREATE TABLE t1(a INT) ENGINE=InnoDB; CREATE TABLE t1(a INT) ENGINE=InnoDB;
CREATE TABLE t3(a INT) ENGINE=myisam; CREATE TABLE t3(a INT) ENGINE=myisam;
connect(purge_control,localhost,root,,);
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connect (locker,localhost,root,,); connect (locker,localhost,root,,);
connection default; connection default;
...@@ -75,6 +77,7 @@ unlock tables; ...@@ -75,6 +77,7 @@ unlock tables;
connection locker; connection locker;
--reap --reap
unlock tables; unlock tables;
disconnect purge_control;
connection default; connection default;
disconnect locker; disconnect locker;
......
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