summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test')
-rw-r--r--mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test6
1 files changed, 6 insertions, 0 deletions
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 3b71bd802ef..c4e9b60e833 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug-zip.test
@@ -17,6 +17,7 @@
# allow test to run only when innodb-page-size=16
--source include/have_innodb_16k.inc
+<<<<<<< HEAD
call mtr.add_suppression("InnoDB: Tablespace for table .* is set as discarded.");
call mtr.add_suppression("InnoDB: Cannot calculate statistics for table .* because the .ibd file is missing. Please refer to .* for how to resolve the issue.");
call mtr.add_suppression("InnoDB: Error: Tablespace flags .* corrupted unused .*");
@@ -24,6 +25,11 @@ call mtr.add_suppression("InnoDB: Tablespace flags: .* corrupted in file: .* ")
call mtr.add_suppression("InnoDB: Page 0 at offset 0 looks corrupted in file .*");
call mtr.add_suppression("InnoDB: Page for tablespace .* ");
flush tables;
+=======
+call mtr.add_suppression("InnoDB: Page for tablespace ");
+call mtr.add_suppression("InnoDB: Invalid FSP_SPACE_FLAGS=0x");
+FLUSH TABLES;
+>>>>>>> origin/10.1
let MYSQLD_DATADIR =`SELECT @@datadir`;
let $pathfix=/: '.*test_wl5522.*t1.ibd'/: 'test_wl5522_t1.ibd'/;