summaryrefslogtreecommitdiff
path: root/mysql-test/main/backup_interaction.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-01-13 14:28:08 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-01-13 14:45:37 +0200
commit8576a7bacfaa4f7ac3ec86cff436e0d6e7bb3a7d (patch)
treebbfacf9a3caf08774966c3785b633c01a230e43b /mysql-test/main/backup_interaction.result
parent98a67eccc57774a9322ed006ab3d871181130888 (diff)
downloadmariadb-git-8576a7bacfaa4f7ac3ec86cff436e0d6e7bb3a7d.tar.gz
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.
Diffstat (limited to 'mysql-test/main/backup_interaction.result')
-rw-r--r--mysql-test/main/backup_interaction.result10
1 files changed, 5 insertions, 5 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;
#