summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-12 20:17:05 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-12 20:18:44 +0200
commitaa6058469e2fbf9260e9b8b80ab4975ffa4e53ab (patch)
treee4374055df24528303a04e6c715fb65c52b36d8f /mysql-test/include
parentee17f7285a4a41da2b9fcbb7986dea62ad669c24 (diff)
downloadmariadb-git-aa6058469e2fbf9260e9b8b80ab4975ffa4e53ab.tar.gz
Revert a part of commit 676f43da3a1951e4e41d1cdb08d2c6c7833cb26e
We do want to ignore InnoDB's internal #sql-ib*.ibd at shutdown, because those tables will be dropped on the next startup. Failure to filter out these table names occasionally causes some unwanted output for tests that restart InnoDB soon after dropping or truncating tables, for example innodb.recovery_shutdown.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/check-testcase.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test
index 46601a67edf..4ca53989d06 100644
--- a/mysql-test/include/check-testcase.test
+++ b/mysql-test/include/check-testcase.test
@@ -83,6 +83,7 @@ call mtr.check_testcase();
let $datadir=`select @@datadir`;
list_files $datadir mysql_upgrade_info;
list_files_write_file $datadir.tempfiles.txt $datadir/test #sql*;
+--replace_regex /#sql-ib[0-9a-f]+-[0-9a-f]+\.ibd\n//
cat_file $datadir.tempfiles.txt;
remove_file $datadir.tempfiles.txt;
list_files $datadir/mysql #sql*;