diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 08:53:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-16 08:58:01 +0200 |
| commit | 89633995e4962a7ad4a241cdf62ee637990d6787 (patch) | |
| tree | 86f2184dc7b35cc0822da8f30733f663f0cb3a1f /mysql-test/include | |
| parent | 28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (diff) | |
| download | mariadb-git-89633995e4962a7ad4a241cdf62ee637990d6787.tar.gz | |
MDEV-16678: Actually ignore #sql-ib tables
Apparently, regular expression operations that remove entire lines
of output do not work with list_files, and hence the adjustments in
commit 1c282d4bc48326f8b5407d372a7053c940b67252 were ineffective.
For cat_file (preceded by list_files_write_file) the replace_regex
does work.
For some reason, for suite/parts/inc/partition_crash_exchange.inc
some file names will be lost when using list_files_write_file
instead of list_files.
We use a precise pattern match. dict_mem_create_temporary_tablename()
is generating #sql-ib names followed by decimal digits only.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/check-testcase.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index 191feae1628..514c28b0e00 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -98,7 +98,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]+\.ibd\n// +--replace_regex /#sql-ib[1-9][0-9]*\.ibd\n// cat_file $datadir.tempfiles.txt; remove_file $datadir.tempfiles.txt; list_files $datadir/mysql #sql*; |