From c3afcc7c0a23bda01ffb0282612e33f584b0a687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Tue, 14 Jul 2020 16:17:25 +0300
Subject: [PATCH] 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.
---
 mysql-test/main/mdl.result | 3 +++
 mysql-test/main/mdl.test   | 3 +++
 2 files changed, 6 insertions(+)

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;