Browse Source

MDEV-16678: Ignore stray #sql-ib tables

The adjustments in adb117cf69
turned out to be insufficient.
pull/1428/head
Marko Mäkelä 6 years ago
parent
commit
1c282d4bc4
  1. 2
      mysql-test/suite/innodb/t/innodb-wl5980-alter.test
  2. 2
      mysql-test/suite/parts/inc/partition_crash.inc

2
mysql-test/suite/innodb/t/innodb-wl5980-alter.test

@ -8,7 +8,7 @@
--disable_query_log
# These values can change during the test
LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
LET $regexp=/FTS_[0-9a-f_]+([A-Z0-9_]+)\.([islbd]{3})/FTS_AUX_\1.\2/;
LET $regexp=/FTS_[0-9a-f_]+([A-Z0-9_]+)\.([islbd]{3})/FTS_AUX_\1.\2/ /#sql-ib[0-9a-f]+\.ibd\n//;
# Set up some variables
LET $MYSQL_DATA_DIR = `select @@datadir`;

2
mysql-test/suite/parts/inc/partition_crash.inc

@ -14,7 +14,7 @@ SELECT * FROM t1;
--error 2013
--eval $crash_statement
--echo # State after crash (before recovery)
--replace_regex /sqlx.*\./sqlx-nnnn_nnnn./ /#p#/#P#/ /#sp#/#SP#/ /#tmp#/#TMP#/
--replace_regex /sqlx.*\./sqlx-nnnn_nnnn./ /#p#/#P#/ /#sp#/#SP#/ /#tmp#/#TMP#/ /#sql-ib[0-9a-f]+\.ibd\n//
--list_files $DATADIR/test
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--enable_reconnect

Loading…
Cancel
Save