summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqldump.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-15 11:14:23 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-15 11:14:23 +0200
commitc562ccf796c085211461386510ea5f7a8137cb96 (patch)
treedfb09ff1a558934573e80b9e877fb25ab6532df2 /mysql-test/main/mysqldump.test
parent697dbd15e0102f33fba1d1d6d9aa964b638f9534 (diff)
downloadmariadb-git-c562ccf796c085211461386510ea5f7a8137cb96.tar.gz
MDEV-30233 DROP DATABASE test fails: Directory not empty
Some tests drop the default mtr database "test". This may fail due to the directory not being empty. InnoDB may not delete all tables immediately, due to the "background drop table queue" or its replacement in commit 1bd681c8b3c5213ce1f7976940a7dc38b48a0d39 (the purge of history would clean up after a DDL operation during which the server was killed). Let us try to avoid "drop database test" whenever it is easily possible. Where it is not, SET GLOBAL innodb_max_purge_lag_wait=0 will ensure that the replacement of the "background drop table queue" will have completed its job.
Diffstat (limited to 'mysql-test/main/mysqldump.test')
-rw-r--r--mysql-test/main/mysqldump.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test
index 89155a435b1..a099727ba38 100644
--- a/mysql-test/main/mysqldump.test
+++ b/mysql-test/main/mysqldump.test
@@ -1921,6 +1921,8 @@ SHOW EVENTS;
--echo # with --all-databases
--echo #
--exec $MYSQL_DUMP --default-character-set=utf8mb4 --ignore-database test --all-databases > $MYSQLTEST_VARDIR/tmp/mysqldump-MDEV-13336.sql
+# Starting with MariaDB 10.6, ensure that DDL recovery will have completed.
+SET GLOBAL innodb_max_purge_lag_wait=0;
DROP DATABASE test;
--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/mysqldump-MDEV-13336.sql
SHOW DATABASES LIKE 'test';