diff options
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-wl5522-debug.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-wl5522-debug.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-debug.test b/mysql-test/suite/innodb/t/innodb-wl5522-debug.test index e537f5c0fc3..533637a3568 100644 --- a/mysql-test/suite/innodb/t/innodb-wl5522-debug.test +++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug.test @@ -25,7 +25,12 @@ call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.") call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .*"); call mtr.add_suppression("InnoDB: Page 0 at offset 0 looks corrupted in file .*"); call mtr.add_suppression("InnoDB: Page for tablespace .* "); +<<<<<<< HEAD flush tables; +======= +call mtr.add_suppression("InnoDB: Invalid FSP_SPACE_FLAGS="); +FLUSH TABLES; +>>>>>>> origin/10.1 let MYSQLD_DATADIR =`SELECT @@datadir`; let $innodb_file_per_table = `SELECT @@innodb_file_per_table`; |