From 2fa3ada07202bfd8764cff0bf2e5bbf8a805f8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 28 Jun 2022 20:58:45 +0300 Subject: [PATCH] Fix a sporadic failure of main.backup_locks Ever since commit 9608773f75e2ca21491ef6825c3616cdc96d1ca5 the InnoDB persistent statistics are enabled on all InnoDB tables by default. We must filter out any output that indicates that the statistics tables are being internally accessed by InnoDB. --- mysql-test/main/backup_locks.result | 2 +- mysql-test/main/backup_locks.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/backup_locks.result b/mysql-test/main/backup_locks.result index 2942231678e..31aed5f3cc8 100644 --- a/mysql-test/main/backup_locks.result +++ b/mysql-test/main/backup_locks.result @@ -32,7 +32,7 @@ a connection con1; drop table t1; connection default; -SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info; +SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info where table_name not like "innodb_%"; LOCK_MODE LOCK_TYPE TABLE_SCHEMA TABLE_NAME MDL_SHARED_HIGH_PRIO Table metadata lock test t1 MDL_INTENTION_EXCLUSIVE Schema metadata lock test diff --git a/mysql-test/main/backup_locks.test b/mysql-test/main/backup_locks.test index 02313186bec..7dc97d7932d 100644 --- a/mysql-test/main/backup_locks.test +++ b/mysql-test/main/backup_locks.test @@ -39,7 +39,7 @@ let $wait_condition= select count(*) = 1 from information_schema.processlist where state = "Waiting for table metadata lock"; --source include/wait_condition.inc -SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info; +SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA, TABLE_NAME FROM information_schema.metadata_lock_info where table_name not like "innodb_%"; --error ER_LOCK_DEADLOCK select * from t1; backup unlock;