From 8576a7bacfaa4f7ac3ec86cff436e0d6e7bb3a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 13 Jan 2020 14:28:08 +0200
Subject: [PATCH] MDEV-21281 main.backup_interaction fails intermittently

With MDEV-16678, some InnoDB background tasks will acquire MDL,
and we must filter out such requests in the test.
For this test, an alternative might have been to use wait_all_purged.inc.
---
 mysql-test/main/backup_interaction.result | 10 +++++-----
 mysql-test/main/backup_interaction.test   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-test/main/backup_interaction.result b/mysql-test/main/backup_interaction.result
index f1354f6778e..02ef0af070e 100644
--- a/mysql-test/main/backup_interaction.result
+++ b/mysql-test/main/backup_interaction.result
@@ -37,7 +37,7 @@ unlock tables;
 #
 backup stage start;
 unlock tables;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 lock_mode
 MDL_BACKUP_START
 lock table t1 write;
@@ -98,11 +98,11 @@ drop table t1;
 create table t1(a int) engine=InnoDB;
 begin;
 insert into t1 values(1);
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 lock_mode
 MDL_SHARED_WRITE
 backup stage start;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 lock_mode
 MDL_BACKUP_START
 backup stage block_commit;
@@ -205,12 +205,12 @@ begin;
 select * from t1;
 col1
 1
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 lock_mode
 MDL_BACKUP_WAIT_COMMIT
 MDL_SHARED_READ
 backup stage end;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 lock_mode
 drop table t1;
 #
diff --git a/mysql-test/main/backup_interaction.test b/mysql-test/main/backup_interaction.test
index 8ac905cc6ff..42b392f3125 100644
--- a/mysql-test/main/backup_interaction.test
+++ b/mysql-test/main/backup_interaction.test
@@ -52,7 +52,7 @@ unlock tables;
 --echo #
 backup stage start;
 unlock tables;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 
 --error ER_BACKUP_LOCK_IS_ACTIVE
 lock table t1 write;
@@ -121,9 +121,9 @@ drop table t1;
 create table t1(a int) engine=InnoDB;
 begin;
 insert into t1 values(1);
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 backup stage start;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 backup stage block_commit;
 commit;
 backup stage end;
@@ -224,9 +224,9 @@ backup stage start;
 backup stage block_commit;
 begin;
 select * from t1;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 backup stage end;
-select lock_mode from information_schema.metadata_lock_info;
+select lock_mode from information_schema.metadata_lock_info where thread_id>0;
 drop table t1;
 
 --echo #