diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-31 08:49:36 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-31 08:49:36 +0200 |
| commit | cb5685a87239d35ff4173192cbc345605bdb1e1a (patch) | |
| tree | d382215fd6ea57f1991bb038b9902f06acde4965 | |
| parent | 9aa73153db765166712dd45e07da7f274c216a9e (diff) | |
| download | mariadb-git-cb5685a87239d35ff4173192cbc345605bdb1e1a.tar.gz | |
MDEV-11184: innodb.innodb-wl5522-debug-zip fails in buildbot on Windows
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result b/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result index 53bc22e3d3c..6231a875804 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result +++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug-zip.result @@ -1,4 +1,5 @@ call mtr.add_suppression("InnoDB: Page for tablespace .* "); +FLUSH TABLES; SET GLOBAL innodb_file_per_table = 1; SELECT @@innodb_file_per_table; @@innodb_file_per_table @@ -576,10 +577,6 @@ set global innodb_monitor_enable = default; set global innodb_monitor_disable = default; set global innodb_monitor_reset = default; set global innodb_monitor_reset_all = default; -Warnings: -Error 145 Table './mtr/test_suppressions' is marked as crashed and should be repaired -Error 1194 Table 'test_suppressions' is marked as crashed and should be repaired -Error 1034 1 client is using or hasn't closed the table properly SET GLOBAL INNODB_FILE_PER_TABLE=1; SET GLOBAL INNODB_FILE_FORMAT=Antelope; SET SESSION innodb_strict_mode=0; diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test index 701255d36ec..80aa8f558fd 100644 --- a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test +++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test @@ -18,6 +18,7 @@ --source include/have_innodb_16k.inc call mtr.add_suppression("InnoDB: Page for tablespace .* "); +FLUSH TABLES; let MYSQLD_DATADIR =`SELECT @@datadir`; let $innodb_file_per_table = `SELECT @@innodb_file_per_table`; |