diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 16:17:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 16:17:25 +0300 |
| commit | c3afcc7c0a23bda01ffb0282612e33f584b0a687 (patch) | |
| tree | 2322bce53e9664c9368d7a346487d420acea945a | |
| parent | 30e7a0a866dce530d8328c6d614e48d39a264f9b (diff) | |
| download | mariadb-git-c3afcc7c0a23bda01ffb0282612e33f584b0a687.tar.gz | |
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.
| -rw-r--r-- | mysql-test/main/mdl.result | 3 | ||||
| -rw-r--r-- | mysql-test/main/mdl.test | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/main/mdl.result b/mysql-test/main/mdl.result index 883f35674c0..fbf80312ac0 100644 --- a/mysql-test/main/mdl.result +++ b/mysql-test/main/mdl.result @@ -58,6 +58,8 @@ DROP TABLE t1,t3; # CREATE TABLE t1(a INT) ENGINE=InnoDB; CREATE TABLE t3(a INT) ENGINE=myisam; +connect purge_control,localhost,root,,; +START TRANSACTION WITH CONSISTENT SNAPSHOT; connect locker,localhost,root,,; connection default; FLUSH TABLES WITH READ LOCK; @@ -85,6 +87,7 @@ MDL_SHARED_WRITE Table metadata lock test t3 unlock tables; connection locker; unlock tables; +disconnect purge_control; connection default; disconnect locker; DROP TABLE t1,t3; diff --git a/mysql-test/main/mdl.test b/mysql-test/main/mdl.test index 23a862f5212..0c1b7a13a0c 100644 --- a/mysql-test/main/mdl.test +++ b/mysql-test/main/mdl.test @@ -40,6 +40,8 @@ DROP TABLE t1,t3; CREATE TABLE t1(a INT) ENGINE=InnoDB; CREATE TABLE t3(a INT) ENGINE=myisam; +connect(purge_control,localhost,root,,); +START TRANSACTION WITH CONSISTENT SNAPSHOT; connect (locker,localhost,root,,); connection default; @@ -75,6 +77,7 @@ unlock tables; connection locker; --reap unlock tables; +disconnect purge_control; connection default; disconnect locker; |