diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-01-27 09:13:48 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-01-27 09:13:48 +0200 |
| commit | ebdf70db2a36bba0ccdab7c680a252040c350a50 (patch) | |
| tree | d0143562bddeaa637e8a493ac015aa86d8a9e876 | |
| parent | fea4959a0d54aa3d74c41f483ba4016b9e3364cd (diff) | |
| download | mariadb-git-ebdf70db2a36bba0ccdab7c680a252040c350a50.tar.gz | |
Fix test failure on innodb-wl5522
Added flush tables to avoid corruption of mtr/test_suppressions
table.
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-wl5522.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-wl5522.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result index 4075c8a1486..2ae994e8f3d 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5522.result +++ b/mysql-test/suite/innodb/r/innodb-wl5522.result @@ -1,4 +1,5 @@ call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT."); +FLUSH TABLES; CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b char(22), @@ -1013,3 +1014,4 @@ DROP TABLE t1; call mtr.add_suppression("Got error -1 when reading table '.*'"); call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'.*"); call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded"); +FLUSH TABLES; diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test index 138e02e1214..d2b6fca4d4a 100644 --- a/mysql-test/suite/innodb/t/innodb-wl5522.test +++ b/mysql-test/suite/innodb/t/innodb-wl5522.test @@ -4,6 +4,7 @@ -- source include/have_innodb.inc call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT."); +FLUSH TABLES; let $MYSQLD_TMPDIR = `SELECT @@tmpdir`; let $MYSQLD_DATADIR = `SELECT @@datadir`; @@ -858,6 +859,7 @@ DROP TABLE t1; call mtr.add_suppression("Got error -1 when reading table '.*'"); call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'.*"); call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded"); +FLUSH TABLES; # cleanup --remove_file $MYSQLTEST_VARDIR/tmp/t1.cfg |