diff options
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-wl5522-debug.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-wl5522-debug.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result index 8327ef36909..11a21b205aa 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result +++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result @@ -8,7 +8,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 SET GLOBAL innodb_file_per_table = 1; SELECT @@innodb_file_per_table; @@innodb_file_per_table @@ -921,7 +926,11 @@ ERROR HY000: Tablespace has been discarded for table `t1` restore: t1 .ibd and .cfg files SET SESSION debug_dbug="+d,fsp_flags_is_valid_failure"; ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE; +<<<<<<< HEAD ERROR HY000: Internal error: Cannot reset LSNs in table `test_wl5522`.`t1` : Unsupported +======= +ERROR HY000: Internal error: Cannot reset LSNs in table '"test_wl5522"."t1"' : Data structure corruption +>>>>>>> origin/10.1 SET SESSION debug_dbug="-d,fsp_flags_is_valid_failure"; DROP TABLE test_wl5522.t1; unlink: t1.ibd |