Updated mtr files to support different compiled in options

This allows one to run the test suite even if any of the following
options are changed:
- character-set-server
- collation-server
- join-cache-level
- log-basename
- max-allowed-packet
- optimizer-switch
- query-cache-size and query-cache-type
- skip-name-resolve
- table-definition-cache
- table-open-cache
- Some innodb options
etc

Changes:
- Don't print out the value of system variables as one can't depend on
  them to being constants.
- Don't set global variables to 'default' as the default may not
  be the same as the test was started with if there was an additional
  option file. Instead save original value and reset it at end of test.
- Test that depends on the latin1 character set should include
  default_charset.inc or set the character set to latin1
- Test that depends on the original optimizer switch, should include
  default_optimizer_switch.inc
- Test that depends on the value of a specific system variable should
  set it in the test (like optimizer_use_condition_selectivity)
- Split subselect3.test into subselect3.test and subselect3.inc to
  make it easier to set and reset system variables.
- Added .opt files for test that required specfic options that could
  be changed by external configuration files.
- Fixed result files in rockdsb & tokudb that had not been updated for
  a while.

1 files changed, 262 insertions, 0 deletions

diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result
index 5af7990c84b..dfb576ae52d 100644
--- a/mysql-test/suite/parts/r/partition_debug_innodb.result
+++ b/mysql-test/suite/parts/r/partition_debug_innodb.result
@@ -20,6 +20,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -47,11 +48,13 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -85,6 +88,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -114,11 +118,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -152,6 +158,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -181,11 +188,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -219,6 +228,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -248,11 +258,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -286,6 +298,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -315,12 +328,14 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -354,6 +369,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -383,12 +399,14 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -422,6 +440,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -451,12 +470,14 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -490,6 +511,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -519,12 +541,14 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -560,6 +584,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -587,12 +612,14 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -628,6 +655,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -655,12 +683,14 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -697,6 +727,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -724,6 +755,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -756,6 +788,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -784,6 +817,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -818,6 +852,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -845,6 +880,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -877,6 +913,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -905,6 +942,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -939,6 +977,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -966,6 +1005,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -998,6 +1038,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1026,6 +1067,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1060,6 +1102,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1087,6 +1130,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1119,6 +1163,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1147,6 +1192,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1181,6 +1227,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1208,6 +1255,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1240,6 +1288,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1268,6 +1317,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1302,6 +1352,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1329,6 +1380,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1361,6 +1413,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1389,6 +1442,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1423,6 +1477,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1450,6 +1505,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1482,6 +1538,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1510,6 +1567,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1544,6 +1602,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1571,6 +1630,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -1605,6 +1665,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1633,6 +1694,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -1669,6 +1731,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1696,6 +1759,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -1730,6 +1794,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1758,6 +1823,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -1794,6 +1860,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1821,6 +1888,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -1855,6 +1923,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1883,6 +1952,7 @@ ALTER TABLE t1 ADD PARTITION
 (PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -1920,6 +1990,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1946,11 +2017,13 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -1984,6 +2057,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2012,11 +2086,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2050,6 +2126,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2078,11 +2155,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2116,6 +2195,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2144,11 +2224,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2176,6 +2258,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2204,11 +2287,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2236,6 +2321,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2264,11 +2350,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2296,6 +2384,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2322,11 +2411,13 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2354,6 +2445,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2380,10 +2472,12 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2411,6 +2505,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2437,10 +2532,12 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2469,6 +2566,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2495,6 +2593,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2527,6 +2626,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2554,6 +2654,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2588,6 +2689,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2614,6 +2716,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2646,6 +2749,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2673,6 +2777,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2707,6 +2812,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2733,6 +2839,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2765,6 +2872,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2792,6 +2900,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2826,6 +2935,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2852,6 +2962,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2878,6 +2989,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2905,6 +3017,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2933,6 +3046,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -2959,6 +3073,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -2985,6 +3100,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3012,6 +3128,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3040,6 +3157,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3066,6 +3184,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3092,6 +3211,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3119,6 +3239,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3147,6 +3268,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3173,6 +3295,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3199,6 +3322,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3226,6 +3350,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3254,6 +3379,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3280,6 +3406,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3306,6 +3433,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3333,6 +3461,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3361,6 +3490,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3387,6 +3517,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3413,6 +3544,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3440,6 +3572,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -3470,6 +3603,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3498,11 +3632,13 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3536,6 +3672,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3566,11 +3703,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3604,6 +3743,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3634,11 +3774,13 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3672,6 +3814,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3702,6 +3845,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -3709,6 +3853,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3742,6 +3887,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3772,6 +3918,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -3779,6 +3926,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3812,6 +3960,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3842,6 +3991,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -3849,6 +3999,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3882,6 +4033,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3912,6 +4064,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -3919,6 +4072,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -3954,6 +4108,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -3984,6 +4139,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sql-t1.frm
 #sql-t1.par
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -3991,6 +4147,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -4026,6 +4183,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4054,6 +4212,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -4061,6 +4220,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -4096,6 +4256,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4124,6 +4285,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10#TMP#.ibd
 t1#P#p10.ibd
@@ -4131,6 +4293,7 @@ t1#P#p20#TMP#.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -4166,6 +4329,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4194,12 +4358,14 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -4235,6 +4401,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4263,12 +4430,14 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -4306,6 +4475,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4334,6 +4504,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4366,6 +4537,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4395,6 +4567,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4429,6 +4602,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4457,6 +4631,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4489,6 +4664,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4518,6 +4694,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4552,6 +4729,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4580,6 +4758,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4612,6 +4791,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4641,6 +4821,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4675,6 +4856,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4703,6 +4885,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4735,6 +4918,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4764,6 +4948,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4798,6 +4983,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4826,6 +5012,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4858,6 +5045,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4887,6 +5075,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4921,6 +5110,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4949,6 +5139,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -4981,6 +5172,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5010,6 +5202,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5044,6 +5237,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5072,6 +5266,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5106,6 +5301,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5135,6 +5331,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5171,6 +5368,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5199,6 +5397,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5233,6 +5432,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5262,6 +5462,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5298,6 +5499,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5326,6 +5528,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5360,6 +5563,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5389,6 +5593,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5425,6 +5630,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5453,6 +5659,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5487,6 +5694,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5516,6 +5724,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5552,6 +5761,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5580,6 +5790,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5614,6 +5825,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5643,6 +5855,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5679,6 +5892,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5707,6 +5921,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5741,6 +5956,7 @@ PARTITION BY LIST (a)
 PARTITION p10 VALUES IN (11,12,13,14,15,16,17,18,19));
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -5770,6 +5986,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p10 INTO
 PARTITION p20 VALUES IN (20,21,22,23,24,25,26,27,28,29));
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1#P#p20.ibd
@@ -5826,6 +6043,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -5858,6 +6076,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -5865,6 +6084,7 @@ t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -5931,6 +6151,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -5963,6 +6184,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -5970,6 +6192,7 @@ t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6036,6 +6259,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6068,6 +6292,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6075,6 +6300,7 @@ t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6141,6 +6367,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6174,12 +6401,14 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.ibd
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
 t1.par
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6246,6 +6475,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6279,12 +6509,14 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.ibd
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
 t1.par
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6351,6 +6583,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6384,12 +6617,14 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.ibd
+db.opt
 t1#P#p1.ibd
 t1.frm
 t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6456,6 +6691,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6489,12 +6725,14 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.ibd
+db.opt
 t1#P#p1.ibd
 t1.frm
 t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6561,6 +6799,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6593,6 +6832,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6600,6 +6840,7 @@ t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6666,6 +6907,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before crash
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6698,6 +6940,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6705,6 +6948,7 @@ t1.par
 t2.frm
 t2.ibd
 # State after crash recovery
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6771,6 +7015,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6803,6 +7048,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error in DDL log
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6869,6 +7115,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6901,6 +7148,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error in DDL log
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6967,6 +7215,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -6999,6 +7248,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error on rename of './test/t2' to './test/#sqlx-nnnn_nnnn' (errno: 0 "Internal error/check (Not system error)")
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7065,6 +7315,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7097,6 +7348,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error in DDL log
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7163,6 +7415,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7195,6 +7448,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error on rename of './test/t1#P#p0' to './test/t2' (errno: 0 "Internal error/check (Not system error)")
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7261,6 +7515,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7293,6 +7548,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error in DDL log
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7359,6 +7615,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7391,6 +7648,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error on rename of './test/#sqlx-nnnn_nnnn' to './test/t1#P#p0' (errno: 0 "Internal error/check (Not system error)")
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7457,6 +7715,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7489,6 +7748,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error in DDL log
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7555,6 +7815,7 @@ PARTITION BY RANGE (a)
 PARTITION p1 VALUES LESS THAN MAXVALUE);
 INSERT INTO t1 VALUES (1, "Original from partition p0"), (2, "Original from partition p0"), (3, "Original from partition p0"), (4, "Original from partition p0"), (11, "Original from partition p1"), (12, "Original from partition p1"), (13, "Original from partition p1"), (14, "Original from partition p1"), (21, "Original from partition p1"), (22, "Original from partition p1"), (23, "Original from partition p1"), (24, "Original from partition p1");
 # State before failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm
@@ -7587,6 +7848,7 @@ a	b
 ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
 ERROR HY000: Error in DDL log
 # State after failure
+db.opt
 t1#P#p0.ibd
 t1#P#p1.ibd
 t1.frm