summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-14 09:18:30 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-14 09:18:30 +0200
commit0aca3012a13fb6dcd438d47a5b9d67369dc59535 (patch)
treeec3480a4ef366e0a12d7e3e05c5c5dee385e2d5f /mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
parent12786f0e779fa7d27eeabd91c3243fefc5fb07b8 (diff)
parentfa389b9098722522fa17c216375ea7ea8c5757c5 (diff)
downloadmariadb-git-0aca3012a13fb6dcd438d47a5b9d67369dc59535.tar.gz
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result')
-rw-r--r--mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
index 6c754d143c3..62a28a981cd 100644
--- a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
+++ b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
@@ -86,7 +86,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
SET SESSION debug_dbug="+d,ib_import_reset_space_and_lsn_failure";
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Internal error: Cannot reset LSNs in table `test`.`t1` : Too many concurrent transactions
+ERROR HY000: Internal error: Error importing tablespace for table `test`.`t1` : Too many concurrent transactions
restore: t1 .ibd and .cfg files
SET SESSION debug_dbug=@saved_debug_dbug;
SET SESSION debug_dbug="+d,ib_import_open_tablespace_failure";
@@ -316,7 +316,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
SET SESSION debug_dbug="+d,ib_import_trigger_corruption_1";
ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Internal error: Cannot reset LSNs in table `test`.`t1` : Data structure corruption
+ERROR HY000: Internal error: Error importing tablespace for table `test`.`t1` : Data structure corruption
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE t1;
unlink: t1.ibd
@@ -365,6 +365,8 @@ SELECT COUNT(*) FROM t1;
ERROR HY000: Tablespace has been discarded for table `t1`
SET SESSION debug_dbug="+d,ib_import_create_index_failure_1";
ALTER TABLE t1 ADD INDEX idx(c1);
+Warnings:
+Warning 1814 Tablespace has been discarded for table `t1`
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE t1;
unlink: t1.ibd