MDEV-12645 - mysql_install_db: no install test db option

Added --skip-test-db option to mysql_install_db. If specified, no test database created and relevant grants issued. Removed --skip-auth-anonymous-user option of mysql_install_db. Now it is covered by --skip-test-db. Dropped some Debian patches that did the same. Removed unused make_win_bin_dist.1, make_win_bin_dist and mysql_install_db.pl.in.
author: Sergey Vojtovich <svoj@mariadb.org> 2018-04-11 16:50:32 +0400
committer: Sergey Vojtovich <svoj@mariadb.org> 2018-04-30 19:34:08 +0400
commit: 9a8498066865b508239b36853403f2700800af2b (patch)
tree: 265e8c8abb576d57960a8f43ac6e5b4e0b9f9bf2
parent: 8bbcc0d5050dcbd44c0bc396c6b1acd488d3dfe2 (diff)
download: mariadb-git-9a8498066865b508239b36853403f2700800af2b.tar.gz
52 files changed, 729 insertions, 1386 deletions
diff --git a/debian/mariadb-server-10.3.install b/debian/mariadb-server-10.3.install
index d8de5512b05..94e6a0626e8 100644
--- a/debian/mariadb-server-10.3.install
+++ b/debian/mariadb-server-10.3.install
@@ -98,4 +98,5 @@ usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_test_data_timezone.sql
+usr/share/mysql/mysql_test_db.sql
 usr/share/mysql/wsrep_notify
diff --git a/debian/mariadb-server-10.3.postinst b/debian/mariadb-server-10.3.postinst
index 2a85099b45b..c9fd3d31334 100644
--- a/debian/mariadb-server-10.3.postinst
+++ b/debian/mariadb-server-10.3.postinst
@@ -141,7 +141,9 @@ EOF
     # Debian: beware of the bashisms...
     # Debian: can safely run on upgrades with existing databases
     set +e
-    bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
+    bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql \
+                                   --disable-log-bin --skip-test-db 2>&1 | \
+                                   $ERR_LOGGER
     set -e
 
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 5d090c644f1..547a0c5ef64 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,2 @@
-33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
-41_scripts__mysql_install_db.sh__no_test.dpatch
-50_mysql-test__db_test.dpatch
 61_replace_dash_with_bash_mbug675185.dpatch
diff --git a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch b/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
deleted file mode 100755
index 06c984c398c..00000000000
--- a/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: scripts__mysql_create_system_tables__no_test
-## DP: A user with no password prevents a normal user from login under certain
-## DP: circumstances as it is checked first. See #301741.
-## DP: http://bugs.mysql.com/bug.php?id=6901
-
-@DPATCH@
---- a/scripts/mysql_system_tables_data.sql
-+++ b/scripts/mysql_system_tables_data.sql
-@@ -27,15 +27,6 @@
- SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname;
- 
-
---- Fill "db" table with default grants for anyone to
---- access database 'test' and 'test_%' if "db" table didn't exist
--CREATE TEMPORARY TABLE tmp_db LIKE db;
--INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
--INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
--INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
--DROP TABLE tmp_db;
--
--
- -- Fill "user" table with default users allowing root access
- -- from local machine if "user" table didn't exist before
- CREATE TEMPORARY TABLE tmp_user_nopasswd LIKE user;
-@@ -48,9 +39,6 @@ REPLACE INTO tmp_user_nopasswd VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y'
- REPLACE INTO tmp_user_nopasswd VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0);
- -- More secure root account using unix sucket auth.
- INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root'),'','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N','', 0);
---- Anonymous user with no privileges.
--INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost','');
--INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
- 
- INSERT INTO user SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @skip_auth_root_nopasswd IS NULL;
- INSERT INTO user SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL;
diff --git a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch b/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
deleted file mode 100755
index 9a063e408a5..00000000000
--- a/debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 41_scripts__mysql_install_db.sh__no_test.dpatch by  <ch@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: scripts__mysql_install_db.sh__no_test
-## DP: http://bugs.mysql.com/bug.php?id=6901
-
-@DPATCH@
-
---- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh   2008-01-29 22:41:20.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh        2008-02-28 10:08:11.000000000 +0100
-@@ -407,7 +407,7 @@ then
- fi
- 
- # Create database directories
--for dir in "$ldata" "$ldata/mysql" "$ldata/test"
-+for dir in "$ldata" "$ldata/mysql"
- do
-   if test ! -d "$dir"
-   then
diff --git a/debian/patches/50_mysql-test__db_test.dpatch b/debian/patches/50_mysql-test__db_test.dpatch
deleted file mode 100755
index ed2efb95998..00000000000
--- a/debian/patches/50_mysql-test__db_test.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_mysql-test__db_test.dpatch by Christian Hammers <ch@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch 33_scripts__mysql_create_system_tables__no_test removes the
-## DP: rights for anybody to connect to the test database but the test
-## DP: suite depends on them.
-
-@DPATCH@
-
---- old/mysql-test/mysql-test-run.pl   2009-06-16 14:24:09.000000000 +0200
-+++ new/mysql-test/mysql-test-run.pl   2009-07-04 00:03:34.000000000 +0200
-@@ -3180,6 +3180,11 @@ sub mysql_install_db {
-       mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
-            $bootstrap_sql_file);
- 
-+      mtr_tofile($bootstrap_sql_file, "-- Debian removed the default privileges on the 'test' database\n");
-+      mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');\n");
-+      mtr_tofile($bootstrap_sql_file, "INSERT INTO mysql.db VALUES ('%','test\\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');\n");
-+
-+
-       # Add test data for timezone - this is just a subset, on a real
-       # system these tables will be populated either by mysql_tzinfo_to_sql
-       # or by downloading the timezone table package from our website
diff --git a/man/make_win_bin_dist.1 b/man/make_win_bin_dist.1
deleted file mode 100644
index f54f1144ed0..00000000000
--- a/man/make_win_bin_dist.1
+++ /dev/null
@@ -1,176 +0,0 @@
-'\" t
-.\"
-.TH "\FBMAKE_WIN_BIN_DIST" "1" "9 May 2017" "MariaDB 10\&.3" "MariaDB Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.\" make_win_bin_dist
-.SH "NAME"
-make_win_bin_dist \- package MySQL distribution as ZIP archive
-.SH "SYNOPSIS"
-.HP \w'\fBmake_win_bin_dist\ [\fR\fB\fIoptions\fR\fR\fB]\ \fR\fB\fIpackage_basename\fR\fR\fB\ [\fR\fB\fIcopy_def\fR\fR\fB\ \&.\&.\&.]\fR\ 'u
-\fBmake_win_bin_dist [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIpackage_basename\fR\fR\fB [\fR\fB\fIcopy_def\fR\fR\fB \&.\&.\&.]\fR
-.SH "DESCRIPTION"
-.PP
-This script is used on Windows after building a MySQL distribution from source to create executable programs\&. It packages the binaries and support files into a ZIP archive that can be unpacked at the location where you want to install MySQL\&.
-.PP
-\fBmake_win_bin_dist\fR
-is a shell script, so you must have Cygwin installed to use it\&.
-.PP
-This program\'s use is subject to change\&. Currently, you invoke it as follows from the root directory of your source distribution:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmake_win_bin_dist [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIpackage_basename\fR\fR\fB [\fR\fB\fIcopy_def\fR\fR\fB \&.\&.\&.]\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-The
-\fIpackage_basename\fR
-argument provides the basename for the resulting ZIP archive\&. This name will be the name of the directory that results from unpacking the archive\&.
-.PP
-Because you might want to include files of directories from other builds, you can instruct this script do copy them in for you, via
-\fIcopy_def\fR
-arguments, which of which is of the form
-\fIrelative_dest_name\fR=\fIsource_name\fR\&.
-.PP
-Example:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-bin/mysqld\-max\&.exe=\&.\&./my\-max\-build/sql/release/mysqld\&.exe
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-If you specify a directory, the entire directory will be copied\&.
-.PP
-\fBmake_win_bin_dist\fR
-supports the following options\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" make_win_bin_dist: debug option
-.\" debug option: make_win_bin_dist
-\fB\-\-debug\fR
-.sp
-Pack the debug binaries and produce an error if they were not built\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" make_win_bin_dist: embedded option
-.\" embedded option: make_win_bin_dist
-\fB\-\-embedded\fR
-.sp
-Pack the embedded server and produce an error if it was not built\&. The default is to pack it if it was built\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" make_win_bin_dist: exe-suffix option
-.\" exe-suffix option: make_win_bin_dist
-\fB\-\-exe\-suffix=\fR\fB\fIsuffix\fR\fR
-.sp
-Add a suffix to the basename of the
-\fBmysql\fR
-binary\&. For example, a suffix of
-\-abc
-produces a binary named
-\fBmysqld\-abc\&.exe\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" make_win_bin_dist: no-debug option
-.\" no-debug option: make_win_bin_dist
-\fB\-\-no\-debug\fR
-.sp
-Do not pack the debug binaries even if they were built\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" make_win_bin_dist: no-embedded option
-.\" no-embedded option: make_win_bin_dist
-\fB\-\-no\-embedded\fR
-.sp
-Do not pack the embedded server even if it was built\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" make_win_bin_dist: only-debug option
-.\" only-debug option: make_win_bin_dist
-\fB\-\-only\-debug\fR
-.sp
-Use this option when the target for this build was
-Debug, and you just want to replace the normal binaries with debug versions (that is, do not use separate
-debug
-directories)\&.
-.RE
-.SH "COPYRIGHT"
-.br
-.PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
-.sp
-.SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-.SH AUTHOR
-MariaDB Foundation (http://www.mariadb.org/).
diff --git a/mysql-test/main/ctype_create.result b/mysql-test/main/ctype_create.result
index 4128be82c23..9a76802579e 100644
--- a/mysql-test/main/ctype_create.result
+++ b/mysql-test/main/ctype_create.result
@@ -83,6 +83,8 @@ USE test;
 #
 # MDEV-7387 Alter table xxx CHARACTER SET utf8, CONVERT TO CHARACTER SET latin1 should fail
 #
+CREATE DATABASE tmp DEFAULT CHARACTER SET latin5;
+USE tmp;
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET DEFAULT, CHARACTER SET utf8;
 ERROR HY000: Conflicting declarations: 'CHARACTER SET DEFAULT' and 'CHARACTER SET utf8'
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8, CHARACTER SET DEFAULT;
@@ -105,6 +107,8 @@ ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET latin1;
 ERROR HY000: Conflicting declarations: 'CHARACTER SET latin5' and 'CHARACTER SET latin1'
 DROP TABLE t1;
+DROP DATABASE tmp;
+USE test;
 #
 # End of 10.0 tests
 #
diff --git a/mysql-test/main/ctype_create.test b/mysql-test/main/ctype_create.test
index 61fc5292094..6ccc83521bd 100644
--- a/mysql-test/main/ctype_create.test
+++ b/mysql-test/main/ctype_create.test
@@ -114,6 +114,8 @@ USE test;
 --echo #
 --echo # MDEV-7387 Alter table xxx CHARACTER SET utf8, CONVERT TO CHARACTER SET latin1 should fail
 --echo #
+CREATE DATABASE tmp DEFAULT CHARACTER SET latin5;
+USE tmp;
 --error ER_CONFLICTING_DECLARATIONS
 CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --error ER_CONFLICTING_DECLARATIONS
@@ -137,6 +139,8 @@ ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET utf8;
 --error ER_CONFLICTING_DECLARATIONS
 ALTER TABLE t1 CONVERT TO CHARACTER SET DEFAULT, CHARACTER SET latin1;
 DROP TABLE t1;
+DROP DATABASE tmp;
+USE test;
 
 --echo #
 --echo # End of 10.0 tests
diff --git a/mysql-test/main/ctype_latin1_de-master.opt b/mysql-test/main/ctype_latin1_de-master.opt
deleted file mode 100644
index 0c072424de9..00000000000
--- a/mysql-test/main/ctype_latin1_de-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---character-set-server=latin1 --collation-server=latin1_german2_ci
diff --git a/mysql-test/main/ctype_latin1_de.result b/mysql-test/main/ctype_latin1_de.result
index 2d3803fba18..4fd366b2e8e 100644
--- a/mysql-test/main/ctype_latin1_de.result
+++ b/mysql-test/main/ctype_latin1_de.result
@@ -1,3 +1,5 @@
+create database latin1_german2_ci default character set latin1 collate latin1_german2_ci;
+use latin1_german2_ci;
 set names latin1;
 set @@collation_connection=latin1_german2_ci;
 select @@collation_connection;
@@ -139,7 +141,7 @@ a
 a
 check table t1;
 Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
+latin1_german2_ci.t1	check	status	OK
 select * from t1 where a like "�%";
 a	b
 �	1
@@ -835,3 +837,5 @@ hex(weight_string('x�' as char(2)))
 #
 # End of 5.6 tests
 #
+drop database latin1_german2_ci;
+use test;
diff --git a/mysql-test/main/ctype_latin1_de.test b/mysql-test/main/ctype_latin1_de.test
index 29a52c36db6..dc261790f6c 100644
--- a/mysql-test/main/ctype_latin1_de.test
+++ b/mysql-test/main/ctype_latin1_de.test
@@ -1,6 +1,8 @@
 #
 # Test latin_de character set
 #
+create database latin1_german2_ci default character set latin1 collate latin1_german2_ci;
+use latin1_german2_ci;
 
 set names latin1;
 set @@collation_connection=latin1_german2_ci;
@@ -180,3 +182,6 @@ select hex(weight_string('x�' as char(2)));
 --echo #
 --echo # End of 5.6 tests
 --echo #
+
+drop database latin1_german2_ci;
+use test;
diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result
index b5bbc268866..a6e324b538f 100644
--- a/mysql-test/main/ctype_ucs.result
+++ b/mysql-test/main/ctype_ucs.result
@@ -205,6 +205,7 @@ DROP TABLE t1;
 #   and reverse() function
 #
 # Problem # 1 (original report): wrong parsing of ucs2 data
+SET character_set_connection=ucs2;
 SELECT '00' UNION SELECT '10' INTO OUTFILE 'tmpp.txt';
 CREATE TABLE t1(a INT);
 LOAD DATA INFILE 'tmpp.txt' INTO TABLE t1 CHARACTER SET ucs2
diff --git a/mysql-test/main/ctype_ucs.test b/mysql-test/main/ctype_ucs.test
index 17a07cd4bf9..9592e27f8e1 100644
--- a/mysql-test/main/ctype_ucs.test
+++ b/mysql-test/main/ctype_ucs.test
@@ -74,6 +74,7 @@ DROP TABLE t1;
 --echo #
 
 --echo # Problem # 1 (original report): wrong parsing of ucs2 data
+SET character_set_connection=ucs2;
 SELECT '00' UNION SELECT '10' INTO OUTFILE 'tmpp.txt';
 CREATE TABLE t1(a INT);
 LOAD DATA INFILE 'tmpp.txt' INTO TABLE t1 CHARACTER SET ucs2
diff --git a/mysql-test/main/drop_bad_db_type.result b/mysql-test/main/drop_bad_db_type.result
index de22373e0fd..d44af1e8808 100644
--- a/mysql-test/main/drop_bad_db_type.result
+++ b/mysql-test/main/drop_bad_db_type.result
@@ -26,8 +26,10 @@ Level	Warning
 Code	1286
 Message	Unknown storage engine 'ARCHIVE'
 install soname 'ha_archive';
+db.opt
 t1.ARZ
 t1.frm
 drop table t1;
+db.opt
 uninstall soname 'ha_archive';
 set debug_dbug='-d,unstable_db_type';
diff --git a/mysql-test/main/partition_alter.result b/mysql-test/main/partition_alter.result
index e42604ba056..448c26c7919 100644
--- a/mysql-test/main/partition_alter.result
+++ b/mysql-test/main/partition_alter.result
@@ -76,6 +76,7 @@ t1	CREATE TABLE `t1` (
 insert t1 values (2, '2020-01-03', 20);
 ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1`
 drop table t1;
+db.opt
 create table t1(id int, d date not null, b bool not null default 0, primary key(id,d))
 partition by range columns (d) (
 partition p1 values less than ('2016-10-18'),
@@ -100,6 +101,7 @@ t1	CREATE TABLE `t1` (
 insert t1 values (2, '2020-01-03', 20);
 ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1`
 drop table t1;
+db.opt
 create table t1 (id_1 int auto_increment, id_2 int, id_3 int, d1 date, dt1 datetime default current_timestamp, dt2 datetime default current_timestamp on update current_timestamp, primary key (id_2, id_3), key(id_1)) partition by hash(id_2) partitions 3 (partition p01, partition p02, partition p03);
 insert into t1 values(0, 1, 1, NULL, now(), now());
 alter online table t1 delay_key_write=1;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 85b9089714f..703c5030810 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3191,9 +3191,6 @@ sub mysql_install_db {
       mtr_appendfile_to_file("$sql_dir/mysql_performance_tables.sql",
                             $bootstrap_sql_file);
 
-      # Don't install anonymous users
-      mtr_tofile($bootstrap_sql_file, "set \@skip_auth_anonymous=1;\n");
-
       # Add the mysql system tables initial data
       # for a production system
       mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
@@ -3211,6 +3208,10 @@ sub mysql_install_db {
       mtr_appendfile_to_file("$sql_dir/fill_help_tables.sql",
            $bootstrap_sql_file);
 
+      # Create test database
+      mtr_appendfile_to_file("$sql_dir/mysql_test_db.sql",
+                            $bootstrap_sql_file);
+
       # mysql.gtid_slave_pos was created in InnoDB, but many tests
       # run without InnoDB. Alter it to MyISAM now
       mtr_tofile($bootstrap_sql_file, "ALTER TABLE gtid_slave_pos ENGINE=MyISAM;\n");
@@ -3228,6 +3229,10 @@ sub mysql_install_db {
            sql_to_bootstrap($text));
     }
 
+    # Remove anonymous users
+    mtr_tofile($bootstrap_sql_file,
+         "DELETE FROM mysql.user where user= '';\n");
+
     # Create mtr database
     mtr_tofile($bootstrap_sql_file,
          "CREATE DATABASE mtr CHARSET=latin1;\n");
@@ -3248,7 +3253,6 @@ sub mysql_install_db {
 
   # Create directories mysql and test
   mkpath("$install_datadir/mysql");
-  mkpath("$install_datadir/test");
 
   if ( My::SafeProcess->run
        (
diff --git a/mysql-test/suite/archive/discover.result b/mysql-test/suite/archive/discover.result
index 0619ca2051a..99bb955ea24 100644
--- a/mysql-test/suite/archive/discover.result
+++ b/mysql-test/suite/archive/discover.result
@@ -17,6 +17,7 @@ select * from t1;
 a
 1
 2
+db.opt
 t1.ARZ
 t1.frm
 #
@@ -30,6 +31,7 @@ show tables;
 Tables_in_test
 t1
 t2
+db.opt
 t1.ARZ
 t2.ARZ
 t2.frm
@@ -41,6 +43,7 @@ show full tables;
 Tables_in_test	Table_type
 t1	BASE TABLE
 t2	BASE TABLE
+db.opt
 t1.ARZ
 t2.ARZ
 t2.frm
@@ -50,6 +53,7 @@ t2.frm
 flush tables;
 truncate table t1;
 ERROR HY000: Storage engine ARCHIVE of the table `test`.`t1` doesn't have this option
+db.opt
 t1.ARZ
 t1.frm
 t2.ARZ
@@ -59,6 +63,7 @@ t2.frm
 #
 flush tables;
 rename table t2 to t0;
+db.opt
 t0.ARZ
 t1.ARZ
 t1.frm
@@ -76,6 +81,7 @@ t1	CREATE TABLE `t1` (
 #
 flush tables;
 drop table t1;
+db.opt
 t0.ARZ
 #
 # discover of table non-existance on drop
@@ -84,6 +90,7 @@ select * from t0;
 a
 flush tables;
 drop table t0;
+db.opt
 show status like 'Handler_discover';
 Variable_name	Value
 Handler_discover	6
@@ -130,6 +137,7 @@ a
 flush tables;
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
+db.opt
 create table t1 (a int) engine=archive;
 select * from t1;
 a
diff --git a/mysql-test/suite/encryption/r/innodb-bad-key-change3.result b/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
index 79155bf43b9..2d414d75c21 100644
--- a/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
+++ b/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
@@ -14,6 +14,7 @@ t1	CREATE TABLE `t1` (
 INSERT INTO t1 VALUES (1,'foobar'),(2,'barfoo');
 FLUSH TABLE t1 FOR EXPORT;
 # List before copying files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result b/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
index a12b47ef31d..cca3b9ad686 100644
--- a/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
+++ b/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
@@ -38,6 +38,7 @@ backup: te_crc32
 backup: t_crc32
 backup: tpe_crc32
 backup: tp_crc32
+db.opt
 t_crc32.cfg
 t_crc32.frm
 t_crc32.ibd
@@ -247,6 +248,7 @@ backup: te_innodb
 backup: t_innodb
 backup: tpe_innodb
 backup: tp_innodb
+db.opt
 t_innodb.cfg
 t_innodb.frm
 t_innodb.ibd
@@ -456,6 +458,7 @@ backup: te_none
 backup: t_none
 backup: tpe_none
 backup: tp_none
+db.opt
 t_none.cfg
 t_none.frm
 t_none.ibd
diff --git a/mysql-test/suite/encryption/r/innodb-discard-import-change.result b/mysql-test/suite/encryption/r/innodb-discard-import-change.result
index 51670d89e52..cafdbef4b69 100644
--- a/mysql-test/suite/encryption/r/innodb-discard-import-change.result
+++ b/mysql-test/suite/encryption/r/innodb-discard-import-change.result
@@ -24,6 +24,7 @@ backup: t2
 backup: t3
 backup: t4
 backup: t5
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/r/innodb-discard-import.result b/mysql-test/suite/encryption/r/innodb-discard-import.result
index 91314a77177..9f8521b3245 100644
--- a/mysql-test/suite/encryption/r/innodb-discard-import.result
+++ b/mysql-test/suite/encryption/r/innodb-discard-import.result
@@ -44,6 +44,7 @@ count(*)
 2000
 FLUSH TABLE t1,t2,t3,t4 FOR EXPORT;
 # List before copying files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -60,6 +61,7 @@ backup: t1
 backup: t2
 backup: t3
 backup: t4
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result b/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
index b503d6c9d30..6b38be38b6d 100644
--- a/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
+++ b/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
@@ -25,6 +25,7 @@ NOT FOUND /foobar/ in t1.ibd
 NOT FOUND /temp/ in t2.ibd
 # t3 ... on expecting NOT FOUND
 NOT FOUND /barfoo/ in t3.ibd
+db.opt
 t1.frm
 t1.ibd
 t2.frm
@@ -35,6 +36,7 @@ FLUSH TABLES t1, t2, t3 FOR EXPORT;
 backup: t1
 backup: t2
 backup: t3
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/innodb/r/alter_copy.result b/mysql-test/suite/innodb/r/alter_copy.result
index 286c5152ded..ac25c6c6c18 100644
--- a/mysql-test/suite/innodb/r/alter_copy.result
+++ b/mysql-test/suite/innodb/r/alter_copy.result
@@ -73,6 +73,7 @@ FTSBEING_DELETED_CACHE.ibd
 FTSCONFIG.ibd
 FTSDELETED.ibd
 FTSDELETED_CACHE.ibd
+db.opt
 t.frm
 t.ibd
 t1.frm
@@ -140,6 +141,7 @@ FTSBEING_DELETED_CACHE.ibd
 FTSCONFIG.ibd
 FTSDELETED.ibd
 FTSDELETED_CACHE.ibd
+db.opt
 t.frm
 t.ibd
 t1.frm
@@ -206,6 +208,7 @@ FTSBEING_DELETED_CACHE.ibd
 FTSCONFIG.ibd
 FTSDELETED.ibd
 FTSDELETED_CACHE.ibd
+db.opt
 t.frm
 t.ibd
 t1.frm
diff --git a/mysql-test/suite/innodb/r/alter_crash.result b/mysql-test/suite/innodb/r/alter_crash.result
index 5bf25cf8592..3c3aaa68b6a 100644
--- a/mysql-test/suite/innodb/r/alter_crash.result
+++ b/mysql-test/suite/innodb/r/alter_crash.result
@@ -48,6 +48,7 @@ SELECT * FROM information_schema.innodb_sys_tables
 WHERE table_id = ID;
 TABLE_ID	NAME	FLAG	N_COLS	SPACE	ROW_FORMAT	ZIP_PAGE_SIZE	SPACE_TYPE
 # Files in datadir after manual recovery.
+db.opt
 t1.frm
 t1.ibd
 SHOW TABLES;
@@ -105,6 +106,7 @@ DROP TABLE t2;
 CREATE TABLE t2 (f1 INT NOT NULL, f2 INT NOT NULL) ENGINE=InnoDB;
 ALTER TABLE t2 ADD PRIMARY KEY (f2, f1);
 DROP TABLE t2;
+db.opt
 # -------------------------
 # End of Testing Scenario 2
 # -------------------------
@@ -123,6 +125,7 @@ SELECT * FROM information_schema.innodb_sys_tables
 WHERE table_id = ID;
 TABLE_ID	NAME	FLAG	N_COLS	SPACE	ROW_FORMAT	ZIP_PAGE_SIZE	SPACE_TYPE
 # Files in datadir after manual recovery.
+db.opt
 t1.frm
 t1.ibd
 SHOW TABLES;
diff --git a/mysql-test/suite/innodb/r/create_isl_with_direct.result b/mysql-test/suite/innodb/r/create_isl_with_direct.result
index 87544e6dcdf..1b830a7d6ce 100644
--- a/mysql-test/suite/innodb/r/create_isl_with_direct.result
+++ b/mysql-test/suite/innodb/r/create_isl_with_direct.result
@@ -5,6 +5,7 @@ CREATE TABLE t1 (x INT) ENGINE=INNODB, DATA DIRECTORY='MYSQL_TMP_DIR';
 # Contents of tmp/test directory containing .ibd file
 t1.ibd
 # Contents of the 'test' database directory containing .isl and .frm files
+db.opt
 t1.frm
 t1.isl
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
index 4ef92cdfed9..1ed857af473 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -31,12 +31,14 @@ a	b	c
 822	Devotion	asdfuihknaskdf
 821	Cavalry	..asdasdfaeraf
 CREATE TABLE t2(a INT PRIMARY KEY) ENGINE=InnoDB ROW_FORMAT=COMPACT;
+db.opt
 t1.frm
 t1.ibd
 t2.frm
 t2.ibd
 FLUSH TABLE t1, t2 FOR EXPORT;
 # List before copying files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -61,12 +63,14 @@ a	b	c
 # Restarting server
 # Done restarting server
 # List before t1 DISCARD
+db.opt
 t1.frm
 t1.ibd
 t2.frm
 t2.ibd
 ALTER TABLE t1 DISCARD TABLESPACE;
 # List after t1 DISCARD
+db.opt
 t1.frm
 t2.frm
 t2.ibd
@@ -85,6 +89,7 @@ a	b	c
 823	Evolution	lsjndofiabsoibeg
 822	Devotion	asdfuihknaskdf
 821	Cavalry	..asdasdfaeraf
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -107,6 +112,7 @@ DROP TABLE t1;
 ALTER TABLE t2 ROW_FORMAT=DYNAMIC;
 ALTER TABLE t2 DISCARD TABLESPACE;
 # List after t2 DISCARD
+db.opt
 t2.frm
 ALTER TABLE t2 IMPORT TABLESPACE;
 ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x1)
@@ -135,6 +141,7 @@ INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
+db.opt
 t1.frm
 t1.ibd
 FLUSH TABLES t1 FOR EXPORT;
@@ -142,6 +149,7 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 16
 backup: t1
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -154,6 +162,7 @@ ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -173,6 +182,7 @@ INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
+db.opt
 t1.frm
 t1.ibd
 FLUSH TABLES t1 FOR EXPORT;
@@ -180,10 +190,12 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 16
 backup: t1
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
 UNLOCK TABLES;
+db.opt
 t1.frm
 t1.ibd
 INSERT INTO t1(c2) SELECT c2 FROM t1;
@@ -196,6 +208,7 @@ ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -220,6 +233,7 @@ SELECT COUNT(*) FROM t1 WHERE c2 = 1;
 COUNT(*)
 16
 backup: t1
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/innodb/r/innodb-wl5980-alter.result b/mysql-test/suite/innodb/r/innodb-wl5980-alter.result
index 27866b68303..aa79383dde2 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5980-alter.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5980-alter.result
@@ -64,6 +64,7 @@ t1	CREATE TABLE `t1` (
   KEY `c2` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir/'
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -99,6 +100,7 @@ test/t1c3	c3	c2	0
 ALTER TABLE t1 CHANGE c2 c2 INT AFTER c1;
 ALTER TABLE t1 CHANGE c1 c1 INT FIRST;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -133,6 +135,7 @@ test/t1c2	c2	c2	0
 test/t1c3	c3	c2	0
 ALTER TABLE t1 CHANGE C2 c3 INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -167,6 +170,7 @@ test/t1c2	c2	c3	0
 test/t1c3	c3	c2	0
 ALTER TABLE t1 CHANGE c3 C INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -201,6 +205,7 @@ test/t1c2	c2	C	0
 test/t1c3	c3	c2	0
 ALTER TABLE t1 CHANGE C Cöŀumň_TWO INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -242,6 +247,7 @@ ALTER TABLE t1 CHANGE cöĿǖmň_two c3 INT;
 ERROR 42S22: Unknown column 'cöĿǖmň_two' in 't1'
 ALTER TABLE t1 CHANGE cÖĿUMŇ_two c3 INT, RENAME TO t3;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -289,6 +295,7 @@ ERROR 42000: Identifier name '12345678901234567890123456789012345678901234567890
 ALTER TABLE t3 CHANGE c3
 `1234567890123456789012345678901234567890123456789012345678901234` INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -325,6 +332,7 @@ ALTER TABLE t3 CHANGE
 `1234567890123456789012345678901234567890123456789012345678901234`
 `倀倁倂倃倄倅倆倇倈倉倊個倌倍倎倏倐們倒倓倔倕倖倗倘候倚倛倜倝倞借倠倡倢倣値倥倦倧倨倩倪倫倬倭倮倯倰倱倲倳倴倵倶倷倸倹债倻值倽倾ä` INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -344,6 +352,7 @@ ALTER TABLE t3 CHANGE
 `倀倁倂倃倄倅倆倇倈倉倊個倌倍倎倏倐們倒倓倔倕倖倗倘候倚倛倜倝倞借倠倡倢倣値倥倦倧倨倩倪倫倬倭倮倯倰倱倲倳倴倵倶倷倸倹债倻值倽倾Ä`
 c3 INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -365,6 +374,7 @@ ALTER TABLE t3 CHANGE c3 😲 INT;
 ERROR HY000: Invalid utf8mb4 character string: '\xF0\x9F\x98\xB2'
 ALTER TABLE t3 RENAME TO t2;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -401,6 +411,7 @@ ON i.TABLE_ID=st.TABLE_ID;
 NAME	NAME
 test/t1	test/t1
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -475,6 +486,7 @@ t1c	CREATE TABLE `t1c` (
   CONSTRAINT `t1c3` FOREIGN KEY (`c3`) REFERENCES `t1p` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir/'
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -514,6 +526,7 @@ ERROR HY000: Cannot drop index 'c3': needed in a foreign key constraint
 SET foreign_key_checks=0;
 ALTER TABLE t1c DROP INDEX C3;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -561,6 +574,7 @@ test/t1c2	c2	c3	0
 test/t1c3	c3	c2	0
 ALTER TABLE t1c DROP FOREIGN KEY t1C3;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -605,6 +619,7 @@ ID	FOR_COL_NAME	REF_COL_NAME	POS
 test/t1c2	c2	c3	0
 ALTER TABLE t1c DROP INDEX c2, DROP FOREIGN KEY t1C2;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -646,6 +661,7 @@ INNER JOIN sys_foreign sf ON i.ID = sf.ID;
 ID	FOR_COL_NAME	REF_COL_NAME	POS
 ALTER TABLE t1 DROP INDEX c2, CHANGE c3 c2 INT;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -698,6 +714,7 @@ FTS_AUX_BEING_DELETED_CACHE.isl
 FTS_AUX_CONFIG.isl
 FTS_AUX_DELETED.isl
 FTS_AUX_DELETED_CACHE.isl
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -794,6 +811,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -855,6 +873,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -910,6 +929,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -966,6 +986,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1031,6 +1052,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1099,6 +1121,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1164,6 +1187,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1221,6 +1245,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1276,6 +1301,7 @@ FTS_AUX_BEING_DELETED_CACHE.isl
 FTS_AUX_CONFIG.isl
 FTS_AUX_DELETED.isl
 FTS_AUX_DELETED_CACHE.isl
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1331,6 +1357,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1392,6 +1419,7 @@ FTS_AUX_BEING_DELETED_CACHE.isl
 FTS_AUX_CONFIG.isl
 FTS_AUX_DELETED.isl
 FTS_AUX_DELETED_CACHE.isl
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1463,6 +1491,7 @@ FTS_AUX_BEING_DELETED_CACHE.isl
 FTS_AUX_CONFIG.isl
 FTS_AUX_DELETED.isl
 FTS_AUX_DELETED_CACHE.isl
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1511,6 +1540,7 @@ FTS_AUX_BEING_DELETED_CACHE.ibd
 FTS_AUX_CONFIG.ibd
 FTS_AUX_DELETED.ibd
 FTS_AUX_DELETED_CACHE.ibd
+db.opt
 sys_foreign.frm
 sys_foreign.ibd
 sys_indexes.frm
@@ -1560,4 +1590,5 @@ ID	FOR_COL_NAME	REF_COL_NAME	POS
 #
 DROP TABLE tt, t1o, sys_tables, sys_indexes, sys_foreign;
 ### files in MYSQL_DATA_DIR/test
+db.opt
 ### files in MYSQL_TMP_DIR/alt_dir/test
diff --git a/mysql-test/suite/innodb/r/instant_alter_crash.result b/mysql-test/suite/innodb/r/instant_alter_crash.result
index 2daaf10fa67..d9e57b397f3 100644
--- a/mysql-test/suite/innodb/r/instant_alter_crash.result
+++ b/mysql-test/suite/innodb/r/instant_alter_crash.result
@@ -101,4 +101,5 @@ t2	CREATE TABLE `t2` (
   UNIQUE KEY `c2` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
 DROP TABLE t1,t2;
+db.opt
 SET GLOBAL innodb_purge_rseg_truncate_frequency=@saved_frequency;
diff --git a/mysql-test/suite/innodb/r/log_file_name.result b/mysql-test/suite/innodb/r/log_file_name.result
index 0d764f65617..99eba0e33e7 100644
--- a/mysql-test/suite/innodb/r/log_file_name.result
+++ b/mysql-test/suite/innodb/r/log_file_name.result
@@ -98,5 +98,6 @@ FOUND 1 /InnoDB: At LSN: \d+: unable to open file .*u[1-5].ibd for tablespace/ i
 FOUND 1 /\[Warning\] InnoDB: Tablespace \d+ was not found at .*u[1-5].ibd, and innodb_force_recovery was set. All redo log for this tablespace will be ignored!/ in mysqld.1.err
 DROP TABLE u1,u2,u3,u6;
 # List of files:
+db.opt
 SHOW TABLES;
 Tables_in_test
diff --git a/mysql-test/suite/innodb/r/row_format_redundant.result b/mysql-test/suite/innodb/r/row_format_redundant.result
index 6deecd10ada..63172897927 100644
--- a/mysql-test/suite/innodb/r/row_format_redundant.result
+++ b/mysql-test/suite/innodb/r/row_format_redundant.result
@@ -77,3 +77,4 @@ ib_buffer_pool
 ib_logfile0
 ib_logfile1
 ibdata1
+db.opt
diff --git a/mysql-test/suite/innodb/t/innodb-mdev7046.test b/mysql-test/suite/innodb/t/innodb-mdev7046.test
index 208dcd52f35..4804e253427 100644
--- a/mysql-test/suite/innodb/t/innodb-mdev7046.test
+++ b/mysql-test/suite/innodb/t/innodb-mdev7046.test
@@ -40,9 +40,6 @@ ALTER TABLE t1 ENGINE=InnoDB;
 
 drop table t1;
 
-let $datadir=`select @@datadir`;
---remove_file $datadir/test/db.opt
-
 --enable_query_log
 --enable_result_log
 --enable_warnings
diff --git a/mysql-test/suite/innodb_zip/r/restart.result b/mysql-test/suite/innodb_zip/r/restart.result
index c4e6daf73fe..1075cf990b2 100644
--- a/mysql-test/suite/innodb_zip/r/restart.result
+++ b/mysql-test/suite/innodb_zip/r/restart.result
@@ -227,6 +227,7 @@ test/t7_restart#p#p1#sp#s3	Single	DEFAULT	DEFAULT	Dynamic	MYSQL_TMP_DIR/alt_dir/
 # Shutdown the server and list the tablespace OS files
 #
 ---- MYSQL_DATA_DIR/test
+db.opt
 t1_restart.frm
 t1_restart.ibd
 t2_restart.frm
@@ -485,6 +486,7 @@ SUBPARTITION BY HASH (`c1`)
 # Shutdown the server and make a backup of a tablespace
 #
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.ibd
 t5_restart.frm
@@ -588,6 +590,7 @@ ERROR 42S01: Table 't55_restart' already exists
 RENAME TABLE t5_restart TO t55_restart;
 ERROR HY000: Error on rename of './test/t5_restart' to './test/t55_restart' (errno: 184 "Tablespace already exists")
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.ibd
 t5_restart.frm
@@ -684,6 +687,7 @@ SUBPARTITION BY HASH (`c1`)
  (SUBPARTITION `s2` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB,
   SUBPARTITION `s3` DATA DIRECTORY = 'MYSQL_TMP_DIR/alt_dir' ENGINE = InnoDB))
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.ibd
 t55_restart.frm
@@ -786,6 +790,7 @@ SUBPARTITION BY HASH (`c1`)
 # Move the remote tablespaces to a new location and change the ISL files
 #
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.ibd
 t55_restart.frm
@@ -816,6 +821,7 @@ t77_restart#p#p1#sp#s3.ibd
 # Moving tablespace 't66_restart' from MYSQL_TMP_DIR/alt_dir to MYSQL_TMP_DIR/new_dir
 # Moving tablespace 't77_restart' from MYSQL_TMP_DIR/alt_dir to MYSQL_TMP_DIR/new_dir
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.isl
 t55_restart.frm
@@ -931,6 +937,7 @@ SUBPARTITION BY HASH (`c1`)
 # Move the remote tablespaces back to the default datadir and delete the ISL file.
 #
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.isl
 t55_restart.frm
@@ -961,6 +968,7 @@ t77_restart#p#p1#sp#s3.ibd
 # Moving 't66_restart' from MYSQL_TMP_DIR/new_dir to MYSQL_DATA_DIR
 # Moving 't77_restart' from MYSQL_TMP_DIR/new_dir to MYSQL_DATA_DIR
 ---- MYSQL_DATA_DIR/test
+db.opt
 t4_restart.frm
 t4_restart.ibd
 t55_restart.frm
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_zip.result
index b4c0597dcf9..f57e2191d9f 100644
--- a/mysql-test/suite/innodb_zip/r/wl5522_zip.result
+++ b/mysql-test/suite/innodb_zip/r/wl5522_zip.result
@@ -29,12 +29,14 @@ a	b	c
 823	Evolution	lsjndofiabsoibeg
 822	Devotion	asdfuihknaskdf
 821	Cavalry	..asdasdfaeraf
+db.opt
 t1.frm
 t1.ibd
 # Restarting server
 # Done restarting server
 FLUSH TABLE t1 FOR EXPORT;
 # List before copying files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -56,10 +58,12 @@ a	b	c
 # Restarting server
 # Done restarting server
 # List before t1 DISCARD
+db.opt
 t1.frm
 t1.ibd
 ALTER TABLE t1 DISCARD TABLESPACE;
 # List after t1 DISCARD
+db.opt
 t1.frm
 ALTER TABLE t1 IMPORT TABLESPACE;
 ALTER TABLE t1 ENGINE InnoDB;
@@ -76,6 +80,7 @@ a	b	c
 823	Evolution	lsjndofiabsoibeg
 822	Devotion	asdfuihknaskdf
 821	Cavalry	..asdasdfaeraf
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -112,6 +117,7 @@ INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
+db.opt
 t1.frm
 t1.ibd
 FLUSH TABLES t1 FOR EXPORT;
@@ -119,6 +125,7 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 16
 backup: t1
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -131,6 +138,7 @@ ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -150,6 +158,7 @@ INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
 INSERT INTO t1(c2) SELECT c2 FROM t1;
+db.opt
 t1.frm
 t1.ibd
 FLUSH TABLES t1 FOR EXPORT;
@@ -157,10 +166,12 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 16
 backup: t1
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
 UNLOCK TABLES;
+db.opt
 t1.frm
 t1.ibd
 INSERT INTO t1(c2) SELECT c2 FROM t1;
@@ -173,6 +184,7 @@ ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT * FROM t1;
 ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -198,6 +210,7 @@ SELECT COUNT(*) FROM t1 WHERE c2 = 1;
 COUNT(*)
 16
 backup: t1
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
index c86b057433a..65a5edba254 100644
--- a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
@@ -53,6 +53,7 @@ Warning	1618	<INDEX DIRECTORY> option ignored
 Warning	1618	<INDEX DIRECTORY> option ignored
 # Verifying .frm, .par, .isl & .ibd files
 ---- MYSQLD_DATADIR/test
+db.opt
 t1#P#p0.isl
 t1#P#p1.isl
 t1.frm
@@ -88,6 +89,7 @@ t1	CREATE TABLE `t1` (
  PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = MyISAM)
 # Verifying .frm, .par and MyISAM files (.MYD, MYI)
 ---- MYSQLD_DATADIR/test
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -115,6 +117,7 @@ t1	CREATE TABLE `t1` (
  PARTITION `p1` DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' ENGINE = InnoDB)
 # Verifying .frm, .par, .isl and InnoDB .ibd files
 ---- MYSQLD_DATADIR/test
+db.opt
 t1#P#p0.isl
 t1#P#p1.isl
 t1.frm
diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result
index 0c43cc70c99..7c6a0f33a9f 100644
--- a/mysql-test/suite/parts/r/partition_debug.result
+++ b/mysql-test/suite/parts/r/partition_debug.result
@@ -40,6 +40,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -75,6 +76,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -85,6 +87,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -152,6 +155,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -187,6 +191,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -197,6 +202,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -264,6 +270,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -299,6 +306,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -309,6 +317,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -376,6 +385,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -413,6 +423,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.MYD
 #sqlx-nnnn_nnnn.MYI
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -421,6 +432,7 @@ t1.frm
 t1.par
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -488,6 +500,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -525,6 +538,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.MYD
 #sqlx-nnnn_nnnn.MYI
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -533,6 +547,7 @@ t1.frm
 t1.par
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -600,6 +615,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -637,6 +653,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.MYD
 #sqlx-nnnn_nnnn.MYI
+db.opt
 t1#P#p1.MYD
 t1#P#p1.MYI
 t1.frm
@@ -645,6 +662,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -712,6 +730,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -749,6 +768,7 @@ ERROR HY000: Lost connection to MySQL server during query
 # State after crash (before recovery)
 #sqlx-nnnn_nnnn.MYD
 #sqlx-nnnn_nnnn.MYI
+db.opt
 t1#P#p1.MYD
 t1#P#p1.MYI
 t1.frm
@@ -757,6 +777,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -824,6 +845,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -859,6 +881,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -869,6 +892,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -936,6 +960,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -971,6 +996,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -981,6 +1007,7 @@ t2.MYD
 t2.MYI
 t2.frm
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1048,6 +1075,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1083,6 +1111,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1150,6 +1179,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1185,6 +1215,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1252,6 +1283,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1287,6 +1319,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1354,6 +1387,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1389,6 +1423,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1456,6 +1491,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1491,6 +1527,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1558,6 +1595,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1593,6 +1631,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1660,6 +1699,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1695,6 +1735,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1762,6 +1803,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1797,6 +1839,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1864,6 +1907,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(64)) 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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
@@ -1899,6 +1943,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.MYD
 t1#P#p0.MYI
 t1#P#p1.MYD
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
diff --git a/mysql-test/suite/parts/r/partition_debug_myisam.result b/mysql-test/suite/parts/r/partition_debug_myisam.result
index ba31418bfb0..fc2dcf7202a 100644
--- a/mysql-test/suite/parts/r/partition_debug_myisam.result
+++ b/mysql-test/suite/parts/r/partition_debug_myisam.result
@@ -17,6 +17,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -46,6 +47,7 @@ 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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -53,6 +55,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -88,6 +91,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -119,6 +123,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -126,6 +131,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -161,6 +167,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -192,6 +199,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -199,6 +207,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -234,6 +243,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -265,6 +275,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -272,6 +283,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -307,6 +319,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -338,6 +351,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -347,6 +361,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -382,6 +397,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -413,6 +429,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -422,6 +439,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -457,6 +475,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -488,6 +507,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -497,6 +517,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -532,6 +553,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -563,6 +585,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -572,6 +595,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -610,6 +634,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -639,6 +664,7 @@ 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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -648,6 +674,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -686,6 +713,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -715,6 +743,7 @@ 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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -724,6 +753,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -763,6 +793,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -792,6 +823,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -826,6 +858,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -856,6 +889,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -892,6 +926,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -921,6 +956,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -955,6 +991,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -985,6 +1022,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1021,6 +1059,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1050,6 +1089,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1084,6 +1124,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1114,6 +1155,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1150,6 +1192,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1179,6 +1222,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1213,6 +1257,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1243,6 +1288,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1279,6 +1325,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1308,6 +1355,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1342,6 +1390,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1372,6 +1421,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1408,6 +1458,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1437,6 +1488,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1471,6 +1523,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1501,6 +1554,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1537,6 +1591,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1566,6 +1621,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1600,6 +1656,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1630,6 +1687,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1666,6 +1724,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1695,6 +1754,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1732,6 +1792,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1762,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1801,6 +1863,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1830,6 +1893,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1867,6 +1931,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1897,6 +1962,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1936,6 +2002,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -1965,6 +2032,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2002,6 +2070,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2032,6 +2101,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2072,6 +2142,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2100,6 +2171,7 @@ 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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2107,6 +2179,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2142,6 +2215,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2172,6 +2246,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2179,6 +2254,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2214,6 +2290,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2244,6 +2321,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2251,6 +2329,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2286,6 +2365,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2316,6 +2396,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2323,6 +2404,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -2351,6 +2433,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2381,6 +2464,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2388,6 +2472,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -2416,6 +2501,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2446,6 +2532,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2453,6 +2540,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -2481,6 +2569,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2509,6 +2598,7 @@ 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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2516,6 +2606,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -2544,6 +2635,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2572,11 +2664,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.MYD
 t1#P#p0.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -2605,6 +2699,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2633,11 +2728,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.MYD
 t1#P#p0.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -2667,6 +2764,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2695,6 +2793,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2729,6 +2828,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2758,6 +2858,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2794,6 +2895,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2822,6 +2924,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2856,6 +2959,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2885,6 +2989,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2921,6 +3026,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2949,6 +3055,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -2983,6 +3090,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3012,6 +3120,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3048,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3076,6 +3186,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3103,6 +3214,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3132,6 +3244,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3161,6 +3274,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3189,6 +3303,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3216,6 +3331,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3245,6 +3361,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3274,6 +3391,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3302,6 +3420,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3329,6 +3448,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3358,6 +3478,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3387,6 +3508,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3415,6 +3537,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3442,6 +3565,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3471,6 +3595,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3500,6 +3625,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3528,6 +3654,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3555,6 +3682,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3584,6 +3712,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3613,6 +3742,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3641,6 +3771,7 @@ a	b
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3668,6 +3799,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3697,6 +3829,7 @@ LOCK TABLE t1 WRITE;
 ALTER TABLE t1 DROP PARTITION p10;
 ERROR HY000: Unknown error
 # State after failure
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1.frm
@@ -3728,6 +3861,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3758,6 +3892,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3765,6 +3900,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3800,6 +3936,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3832,6 +3969,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3839,6 +3977,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3874,6 +4013,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3906,6 +4046,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3913,6 +4054,7 @@ t1#P#p10.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3948,6 +4090,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -3980,6 +4123,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -3991,6 +4135,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4026,6 +4171,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4058,6 +4204,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -4069,6 +4216,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4104,6 +4252,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4136,6 +4285,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -4147,6 +4297,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4182,6 +4333,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4214,6 +4366,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -4225,6 +4378,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4263,6 +4417,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4295,6 +4450,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -4306,6 +4462,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4344,6 +4501,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4374,6 +4532,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -4385,6 +4544,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4423,6 +4583,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4453,6 +4614,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.MYD
 t1#P#p0.MYI
 t1#P#p10#TMP#.MYD
@@ -4464,6 +4626,7 @@ t1#P#p20#TMP#.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4502,6 +4665,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4532,6 +4696,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4541,6 +4706,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4579,6 +4745,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4609,6 +4776,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4618,6 +4786,7 @@ t1#P#p20.MYI
 t1.frm
 t1.par
 # State after crash recovery
+db.opt
 t1#P#p0.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4658,6 +4827,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4688,6 +4858,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4722,6 +4893,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4753,6 +4925,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4789,6 +4962,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4819,6 +4993,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4853,6 +5028,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4884,6 +5060,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4920,6 +5097,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4950,6 +5128,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -4984,6 +5163,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5015,6 +5195,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5051,6 +5232,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5081,6 +5263,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5115,6 +5298,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5146,6 +5330,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5182,6 +5367,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5212,6 +5398,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5246,6 +5433,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5277,6 +5465,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5313,6 +5502,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5343,6 +5533,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5377,6 +5568,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5408,6 +5600,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5444,6 +5637,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5474,6 +5668,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5511,6 +5706,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5542,6 +5738,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5581,6 +5778,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5611,6 +5809,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5648,6 +5847,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5679,6 +5879,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5718,6 +5919,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5748,6 +5950,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5785,6 +5988,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5816,6 +6020,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5855,6 +6060,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5885,6 +6091,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5922,6 +6129,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5953,6 +6161,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -5992,6 +6201,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6022,6 +6232,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6059,6 +6270,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6090,6 +6302,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6129,6 +6342,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6159,6 +6373,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6196,6 +6411,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
@@ -6227,6 +6443,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.MYD
 t1#P#p0.MYI
 t1#P#p10.MYD
diff --git a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
index 678d1968aa4..4841c93e29f 100644
--- a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
+++ b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
@@ -53,6 +53,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
  PARTITION BY RANGE (`a`)
 (PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
+db.opt
 t1#P#p0.ibd
 t1.frm
 t1.par
@@ -79,6 +80,7 @@ connection default;
 TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	PARTITION_ORDINAL_POSITION	PARTITION_DESCRIPTION	TABLE_ROWS
 test	t1	p0	1	10	1
 test	t1	p10	2	MAXVALUE	3
+db.opt
 t1#P#p0.ibd
 t1#P#p10.ibd
 t1.frm
@@ -98,4 +100,5 @@ a
 21
 33
 drop table t1;
+db.opt
 SET DEBUG_SYNC = 'RESET';
diff --git a/mysql-test/suite/sys_vars/r/collation_database_func.result b/mysql-test/suite/sys_vars/r/collation_database_func.result
index 99f0e253005..8bcf9fea224 100644
--- a/mysql-test/suite/sys_vars/r/collation_database_func.result
+++ b/mysql-test/suite/sys_vars/r/collation_database_func.result
@@ -54,7 +54,7 @@ utf8_roman_ci	utf8_roman_ci	utf8	utf8
 USE test;
 SELECT @@collation_database,@@collation_server,@@character_set_database,@@character_set_server;
 @@collation_database	@@collation_server	@@character_set_database	@@character_set_server
-utf8_roman_ci	utf8_roman_ci	utf8	utf8
+latin1_swedish_ci	utf8_roman_ci	latin1	utf8
 'fill table with some test data';
 CREATE TABLE t1(a CHAR(20))CHARACTER SET=latin1;
 INSERT INTO t1 VALUES('Muffler'),('M�ller'),('MX Systems');
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index fc133f53b37..d7f7906f713 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -95,6 +95,7 @@ INSTALL(FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_performance_tables.sql
+  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_db.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_to_mariadb.sql
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
deleted file mode 100755
index 2415d4017e4..00000000000
--- a/scripts/make_win_bin_dist
+++ /dev/null
@@ -1,416 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-# Exit if failing to copy, we want exact specifications, not
-# just "what happen to be built".
-set -e
-
-# ----------------------------------------------------------------------
-# Read first argument that is the base name of the resulting TAR file.
-# See usage() function below for a description on the arguments.
-#
-# NOTE: We will read the rest of the command line later on.
-# NOTE: Pattern matching with "{..,..}" can't be used, not portable.
-# ----------------------------------------------------------------------
-
-# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"?
-
-usage()
-{
-  echo <<EOF
-Usage: make_win_bin_dist [ options ] package-base-name [ copy-defs... ]
-
-This is a script to run from the top of a source tree built on Windows.
-The "package-base-name" argument should be something like
-
-  mysql-noinstall-5.0.25-win32  (or winx64)
-
-and will become the name of the directory of the unpacked ZIP (stripping
-away the "noinstall" part of the ZIP file name if any) and the base
-for the resulting package name.
-
-Options are
-
-  --embedded       Pack the embedded server and give error if not built.
-                   The default is to pack it if it is built.
-
-  --no-embedded    Don't pack the embedded server even if built
-
-  --debug          Pack the debug binaries and give error if not built.
-                   The default is to pack them if they are built.
-
-  --no-debug       Don't pack the debug binaries even if built
-
-  --only-debug     The target for this build was "Debug", and we just
-                   want to replace the normal binaries with debug
-                   versions, i.e. no separate "debug" directories.
-
-  --exe-suffix=SUF Add a suffix to the filename part of the "mysqld" binary.
-
-As you might want to include files of directories from other builds
-(like a "mysqld-max.exe" server), you can instruct this script to copy
-them in for you. This is the "copy-def" arguments, and they are of the
-form
-
-  relative-dest-name=source-name .....
-
-i.e. can be something like
-
-  bin/mysqld-max.exe=../my-max-build/sql/release/mysqld.exe
-
-If you specify a directory the whole directory will be copied.
-
-EOF
-  exit 1
-}
-
-# ----------------------------------------------------------------------
-# We need to be at the top of a source tree, check that we are
-# ----------------------------------------------------------------------
-
-if [ ! -d "sql" ] ; then
-  echo "You need to run this script from inside the source tree"
-  usage
-fi
-
-# ----------------------------------------------------------------------
-# Actual argument processing, first part
-# ----------------------------------------------------------------------
-
-NOINST_NAME=""
-TARGET="release"
-PACK_EMBEDDED=""		# Could be "no", "yes" or empty
-PACK_DEBUG=""			# Could be "no", "yes" or empty
-EXE_SUFFIX=""
-
-for arg do
-  shift
-  case "$arg" in
-    --embedded)       PACK_EMBEDDED="yes" ;;
-    --no-embedded)    PACK_EMBEDDED="no" ;;
-    --debug)          PACK_DEBUG="yes" ;;
-    --no-debug)       PACK_DEBUG="no" ;;
-    --only-debug)     TARGET="debug" ; PACK_DEBUG="no" ;;
-    --exe-suffix=*)   EXE_SUFFIX=`echo "$arg" | sed -e "s,--exe-suffix=,,"` ;;
-    -*)
-      echo "Unknown argument '$arg'"
-      usage
-      ;;
-    *)
-      NOINST_NAME="$arg"
-      break
-  esac
-done
-
-if [ x"$NOINST_NAME" = x"" ] ; then
-  echo "No base package name given"
-  usage
-fi
-DESTDIR=`echo $NOINST_NAME | sed 's/-noinstall-/-/'`
-
-if [ -e $DESTDIR ] ; then
-  echo "Please remove the old $DESTDIR before running this script"
-  usage
-fi
-
-trap 'echo "Cleaning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
-
-# ----------------------------------------------------------------------
-# Adjust target name if needed, release with debug info has another name
-# ----------------------------------------------------------------------
-
-if [ x"$TARGET" = x"release" -a -f "client/relwithdebinfo/mysql.exe" ]
-then
-  TARGET="relwithdebinfo"
-fi
-
-# ----------------------------------------------------------------------
-# Copy executables, and client DLL
-# ----------------------------------------------------------------------
-MYISAM_BINARIES="myisamchk myisamlog myisampack myisam_ftdump"
-MARIA_BINARIES="aria_chk aria_dump_log aria_ftdump aria_pack aria_read_log"
-mkdir $DESTDIR
-mkdir $DESTDIR/bin
-cp client/$TARGET/*.exe                                  $DESTDIR/bin/
-cp extra/$TARGET/*.exe                                   $DESTDIR/bin/
-
-# MyISAM
-#cp storage/myisam/$TARGET/*.exe                          $DESTDIR/bin/
-for eng in $MYISAM_BINARIES ; do 
-  cp storage/myisam/$TARGET/$eng.{exe,pdb} $DESTDIR/bin
-done
-
-# Maria
-for eng in $MARIA_BINARIES ; do 
-  cp storage/maria/$TARGET/$eng.{exe,pdb} $DESTDIR/bin
-done
-
-if [ x"$TARGET" != x"release" ] ; then
-  cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
-  cp client/$TARGET/mysqladmin.pdb                       $DESTDIR/bin/
-  cp client/$TARGET/mysqlbinlog.pdb                      $DESTDIR/bin/
-  cp client/$TARGET/mysqldump.pdb                        $DESTDIR/bin/
-  cp client/$TARGET/mysqlimport.pdb                      $DESTDIR/bin/
-  cp client/$TARGET/mysqlshow.pdb                        $DESTDIR/bin/
-fi
-cp tests/$TARGET/*.exe                                   $DESTDIR/bin/
-cp libmysql/$TARGET/libmysql.dll                         $DESTDIR/bin/
-
-cp sql/$TARGET/mysqld.exe                $DESTDIR/bin/mysqld$EXE_SUFFIX.exe
-if [ x"$TARGET" != x"release" ] ; then
-  cp sql/$TARGET/mysqld.pdb              $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb
-fi
-
-if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \
-     x"$PACK_DEBUG" = x"yes" ] ; then
-  cp sql/debug/mysqld.exe                $DESTDIR/bin/mysqld-debug.exe
-  cp sql/debug/mysqld.pdb                $DESTDIR/bin/mysqld-debug.pdb
-fi
-
-# ----------------------------------------------------------------------
-# Copy data directory, readme files etc
-# ----------------------------------------------------------------------
-
-if [ -d win/data ] ; then
-  cp -pR win/data $DESTDIR/
-fi
-
-mkdir $DESTDIR/Docs
-cp Docs/INSTALL-BINARY    $DESTDIR/Docs/
-cp Docs/manual.chm        $DESTDIR/Docs/ || /bin/true
-cp ChangeLog              $DESTDIR/Docs/ || /bin/true
-cp support-files/my-*.ini $DESTDIR/
-cp README                 $DESTDIR/
-
-if [ -f COPYING ] ; then
-  cp COPYING EXCEPTIONS-CLIENT $DESTDIR/
-  cp COPYING                   $DESTDIR/Docs/
-fi
-
-# ----------------------------------------------------------------------
-# These will be filled in when we enable embedded. Note that if no
-# argument is given, it is copied if exists, else a check is done.
-# ----------------------------------------------------------------------
-
-copy_embedded()
-{
-  mkdir -p $DESTDIR/Embedded/DLL/release \
-           $DESTDIR/Embedded/static/release \
-           $DESTDIR/include
-  cp libmysqld/libmysqld.def           $DESTDIR/include/
-  cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
-  cp libmysqld/$TARGET/libmysqld.dll   $DESTDIR/Embedded/DLL/release/
-  cp libmysqld/$TARGET/libmysqld.exp   $DESTDIR/Embedded/DLL/release/
-  cp libmysqld/$TARGET/libmysqld.lib   $DESTDIR/Embedded/DLL/release/
-  if [ x"$TARGET" != x"release" ] ; then
-    cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/
-    cp libmysqld/$TARGET/libmysqld.pdb   $DESTDIR/Embedded/DLL/release/
-  fi
-
-  if [ x"$PACK_DEBUG" = x"" -a -f "libmysqld/debug/libmysqld.lib" -o \
-       x"$PACK_DEBUG" = x"yes" ] ; then
-    mkdir -p $DESTDIR/Embedded/DLL/debug \
-             $DESTDIR/Embedded/static/debug
-    cp libmysqld/debug/mysqlserver.lib   $DESTDIR/Embedded/static/debug/
-    cp libmysqld/debug/mysqlserver.pdb   $DESTDIR/Embedded/static/debug/
-    cp libmysqld/debug/libmysqld.dll     $DESTDIR/Embedded/DLL/debug/
-    cp libmysqld/debug/libmysqld.exp     $DESTDIR/Embedded/DLL/debug/
-    cp libmysqld/debug/libmysqld.lib     $DESTDIR/Embedded/DLL/debug/
-    cp libmysqld/debug/libmysqld.pdb     $DESTDIR/Embedded/DLL/debug/
-  fi
-}
-
-if [ x"$PACK_EMBEDDED" = x"" -a \
-     -f "libmysqld/$TARGET/mysqlserver.lib" -a \
-     -f "libmysqld/$TARGET/libmysqld.lib" -o \
-     x"$PACK_EMBEDDED" = x"yes" ] ; then
-  copy_embedded
-fi
-
-# ----------------------------------------------------------------------
-# Note: Make sure to sync with include/Makefile.am and WiX installer
-# XML specifications
-# ----------------------------------------------------------------------
-
-mkdir -p $DESTDIR/include
-cp include/mysql.h \
-   include/mysql_com.h \
-   include/mysql_time.h \
-   include/my_list.h \
-   include/my_alloc.h \
-   include/typelib.h \
-   include/my_dbug.h \
-   include/m_string.h \
-   include/my_sys.h \
-   include/my_xml.h \
-   include/mysql_embed.h \
-   include/my_pthread.h \
-   include/my_no_pthread.h \
-   include/decimal.h \
-   include/errmsg.h \
-   include/my_global.h \
-   include/my_config.h \
-   include/my_net.h \
-   include/my_getopt.h \
-   include/sslopt-longopts.h \
-   include/my_dir.h \
-   include/sslopt-vars.h \
-   'include/sslopt-case.h' \
-   include/sql_common.h \
-   include/keycache.h \
-   include/m_ctype.h \
-   include/my_attribute.h \
-   include/my_compiler.h \
-   include/mysqld_error.h \
-   include/sql_state.h \
-   include/mysqld_ername.h \
-   include/mysql_version.h \
-   libmysql/libmysql.def \
-   $DESTDIR/include/
-
-mkdir -p $DESTDIR/include/mysql
-cp include/mysql/plugin.h $DESTDIR/include/mysql/
-
-# ----------------------------------------------------------------------
-# Client libraries, and other libraries
-# ----------------------------------------------------------------------
-
-mkdir -p $DESTDIR/lib/opt
-mkdir -p $DESTDIR/lib/plugin
-cp sql/$TARGET/mysqld.lib $DESTDIR/lib/
-cp libmysql/$TARGET/libmysql.dll \
-   libmysql/$TARGET/libmysql.lib \
-   libmysql/$TARGET/mysqlclient.lib \
-   mysys/$TARGET/mysys.lib \
-   regex/$TARGET/regex.lib \
-   strings/$TARGET/strings.lib \
-   zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
-cp storage/*/$TARGET/ha_*.dll $DESTDIR/lib/plugin/
-
-if [ x"$TARGET" != x"release" ] ; then
-  cp libmysql/$TARGET/libmysql.pdb \
-     libmysql/$TARGET/mysqlclient.pdb \
-     mysys/$TARGET/mysys.pdb \
-     regex/$TARGET/regex.pdb \
-     strings/$TARGET/strings.pdb \
-     zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/
-  cp storage/*/$TARGET/ha_*.pdb $DESTDIR/lib/plugin/
-fi
-
-
-if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
-     x"$PACK_DEBUG" = x"yes" ] ; then
-  mkdir -p $DESTDIR/lib/debug
-  mkdir -p $DESTDIR/lib/plugin/debug
-  cp libmysql/debug/libmysql.dll \
-     libmysql/debug/libmysql.lib \
-     libmysql/debug/libmysql.pdb \
-     libmysql/debug/mysqlclient.lib \
-     libmysql/debug/mysqlclient.pdb \
-     mysys/debug/mysys.lib \
-     mysys/debug/mysys.pdb \
-     regex/debug/regex.lib \
-     regex/debug/regex.pdb \
-     strings/debug/strings.lib \
-     strings/debug/strings.pdb \
-     zlib/debug/zlib.lib \
-     zlib/debug/zlib.pdb $DESTDIR/lib/debug/
-  cp storage/*/debug/ha_*.dll \
-     storage/*/debug/ha_*.lib \
-     storage/*/debug/ha_*.pdb \
-     $DESTDIR/lib/plugin/debug/
-fi
-
-# ----------------------------------------------------------------------
-# Copy the test directory
-# ----------------------------------------------------------------------
-
-mkdir $DESTDIR/mysql-test
-cp mysql-test/mysql-test-run.pl $DESTDIR/mysql-test/
-cp mysql-test/mysql-stress-test.pl $DESTDIR/mysql-test/
-cp mysql-test/README $DESTDIR/mysql-test/
-cp -R mysql-test/{t,r,include,suite,std_data,lib,collections} $DESTDIR/mysql-test/
-
-rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_kill.{dir,vcproj}
-rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_process.{dir,vcproj}
-rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb}
-
-
-# Note that this will not copy "extra" if a soft link
-if [ -d mysql-test/extra ] ; then
-  mkdir $DESTDIR/mysql-test/extra
-  cp -pR mysql-test/extra/* $DESTDIR/mysql-test/extra/
-fi
-
-# ----------------------------------------------------------------------
-# Copy what could be usable in the "scripts" directory
-# ----------------------------------------------------------------------
-
-mysql_scripts="\
-mysql_config.pl \
-mysql_convert_table_format.pl \
-mysql_install_db.pl \
-mysql_secure_installation.pl \
-mysqld_multi.pl \
-mysqldumpslow.pl \
-mysqlhotcopy.pl \
-mytop.pl \
-"
-
-mkdir -p $DESTDIR/scripts
-
-for i in $mysql_scripts
-do
-  cp scripts/$i $DESTDIR/scripts/$i
-done
-
-cp -pR sql/share $DESTDIR/
-cp -pR sql-bench $DESTDIR/
-rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
-
-# The SQL initialisation code is to be in "share"
-cp scripts/*.sql $DESTDIR/share/
-
-# ----------------------------------------------------------------------
-# Clean up from possibly copied SCCS directories
-# ----------------------------------------------------------------------
-
-rm -rf `/bin/find $DISTDIR -type d -name SCCS -print`
-
-# ----------------------------------------------------------------------
-# Copy other files specified on command line DEST=SOURCE
-# ----------------------------------------------------------------------
-
-for arg do
-  dst=`echo $arg | sed -n 's/=.*$//p'`
-  src=`echo $arg | sed -n 's/^.*=//p'`
-
-  if [ x"$dst" = x"" -o x"$src" = x"" ] ; then
-    echo "Invalid specification of what to copy"
-    usage
-  fi
-
-  mkdir -p `dirname $DESTDIR/$dst`
-  cp -pR "$src" $DESTDIR/$dst
-done
-
-# ----------------------------------------------------------------------
-# Finally create the ZIP archive
-# ----------------------------------------------------------------------
-
-rm -f $NOINST_NAME.zip
-zip -r $NOINST_NAME.zip $DESTDIR
-rm -Rf $DESTDIR
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
deleted file mode 100644
index 9d2c1f6874a..00000000000
--- a/scripts/mysql_install_db.pl.in
+++ /dev/null
@@ -1,659 +0,0 @@
-#!@PERL_PATH@
-# -*- cperl -*-
-#
-# Copyright (c) 2007, 2017, Oracle and/or its affiliates.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-##############################################################################
-#
-#  This scripts creates the MySQL Server system tables.
-#
-#  This script try to match the shell script version as close as possible,
-#  but in addition being compatible with ActiveState Perl on Windows.
-#
-#  All unrecognized arguments to this script are passed to mysqld.
-#
-#  NOTE: This script in 5.0 doesn't really match the shell script
-#        version 100%, it is more close to the 5.1 version.
-#
-#  NOTE: This script was deliberately written to be as close to the shell
-#        script as possible, to make the maintenance of both in parallel
-#        easier.
-#
-##############################################################################
-
-use File::Basename;
-use Getopt::Long;
-use Sys::Hostname;
-use Data::Dumper;
-use strict;
-
-Getopt::Long::Configure("pass_through");
-
-my @args;                       # Argument list filled in
-
-##############################################################################
-#
-#  Usage information
-#
-##############################################################################
-
-sub usage
-{
-  print <<EOF;
-Usage: $0 [OPTIONS]
-  --basedir=path       The path to the MySQL installation directory.
-  --builddir=path      If using --srcdir with out-of-directory builds, you
-                       will need to set this to the location of the build
-                       directory where built files reside.
-  --cross-bootstrap    For internal use.  Used when building the MySQL system
-                       tables on a different host than the target.
-  --datadir=path       The path to the MySQL data directory.
-  --defaults-extra-file=name
-                       Read this file after the global files are read.
-  --defaults-file=name Only read default options from the given file name.
-  --force              Causes mysql_install_db to run even if DNS does not
-                       work.  In that case, grant table entries that
-                       normally use hostnames will use IP addresses.
-  --help               Display this help and exit.                     
-  --ldata=path         The path to the MySQL data directory. Same as --datadir.
-  --no-defaults        Don't read default options from any option file.
-  --rpm                For internal use.  This option is used by RPM files
-                       during the MySQL installation process.
-  --skip-name-resolve  Use IP addresses rather than hostnames when creating
-                       grant table entries.  This option can be useful if
-                       your DNS does not work.
-  --srcdir=path        The path to the MySQL source directory.  This option
-                       uses the compiled binaries and support files within the
-                       source tree, useful for if you don't want to install
-                       MySQL yet and just want to create the system tables.
-  --user=user_name     The login username to use for running mysqld.  Files
-                       and directories created by mysqld will be owned by this
-                       user.  You must be root to use this option.  By default
-                       mysqld runs using your current login name and files and
-                       directories that it creates will be owned by you.
-
-All other options are passed to the mysqld program
-
-EOF
-  exit 1;
-}
-
-##############################################################################
-#
-#  Parse an argument list
-#
-#  We only need to pass arguments through to the server if we don't
-#  handle them here.  So, we collect unrecognized options (passed on
-#  the command line) into the args variable.
-#
-##############################################################################
-
-sub parse_arguments
-{
-  my $opt = shift;
-
-  my @saved_ARGV = @ARGV;
-  @ARGV = @_;                           # Set ARGV so GetOptions works
-
-  my $pick_args;
-  if (@ARGV and $ARGV[0] eq 'PICK-ARGS-FROM-ARGV')
-  {
-    $pick_args = 1;
-    shift @ARGV;
-  }
-
-  GetOptions(
-             $opt,
-             "force",
-             "basedir=s",
-             "builddir=s",      # FIXME not documented
-             "srcdir=s",
-             "ldata|datadir|data=s",
-
-             # Note that the user will be passed to mysqld so that it runs
-             # as 'user' (crucial e.g. if log-bin=/some_other_path/
-             # where a chown of datadir won't help)
-             "user=s",
-
-             "skip-name-resolve",
-             "verbose",
-             "rpm",
-             "help",
-             "defaults-file|defaults-extra-file|no-defaults:s",
-
-             # Used when building the MySQL system tables on a different host than
-             # the target. The platform-independent files that are created in
-             # --datadir on the host can be copied to the target system.
-             #
-             # The most common use for this feature is in the Windows installer
-             # which will take the files from datadir and include them as part of
-             # the install package.  See top-level 'dist-hook' make target.
-             #
-             # --windows is a deprecated alias
-             "cross-bootstrap|windows", # FIXME undocumented, even needed?
-  ) or usage();
-
-  usage() if $opt->{help};
-
-  @args =  @ARGV if $pick_args;
-
-  @ARGV = @saved_ARGV;                  # Set back ARGV
-}
-
-##############################################################################
-#
-#  Try to find a specific file within --basedir which can either be a binary
-#  release or installed source directory and return the path.
-#
-##############################################################################
-
-sub find_in_basedir
-{
-  my $opt   = shift;
-  my $mode  = shift;            # "dir" or "file"
-  my $files = shift;
-
-  foreach my $file ( @{ref($files) ? $files : [$files]} )
-  {
-    foreach my $dir ( @_ )
-    {
-      foreach my $part ( "$file","$file.exe","release/$file.exe",
-                         "debug/$file.exe","relwithdebinfo/$file.exe" )
-      {
-        my $path = "$opt->{basedir}/$dir/$part";
-        if ( -f $path )
-        {
-          return $mode eq "dir" ? dirname($path) : $path;
-        }
-      }
-    }
-  }
-}
-
-##############################################################################
-#
-#  Just a function to write out an error report
-#
-##############################################################################
-
-sub cannot_find_file
-{
-  my $file = shift;
-
-  print "FATAL ERROR: Could not find $file\n";
-  print "\n";
-  print "If you compiled from source, you need to run 'make install' to\n";
-  print "copy the software into the correct location ready for operation.\n";
-  print "\n";
-  print "If you are using a binary release, you must either be at the top\n";
-  print "level of the extracted archive, or pass the --basedir option\n";
-  print "pointing to that location.\n";
-  print "\n";
-
-  exit 1;
-}
-
-##############################################################################
-#
-#  Form a command line that can handle spaces in paths and arguments
-#
-##############################################################################
-
-# FIXME this backslash escaping needed if using '"..."' ?
-# This regexp makes sure that any special chars are quoted,
-# so the arg gets passed exactly to the server.
-# XXX: This is broken; true fix requires using eval and proper
-# quoting of every single arg ($opt->{basedir}, $opt->{ldata}, etc.)
-#  join(" ", map {s/([^\w\_\.\-])/\\$1/g}
-
-sub quote_options {
-  my @cmd;
-  foreach my $opt ( @_ )
-  {
-    next unless $opt;           # If undefined or empty, just skip
-    push(@cmd, "\"$opt\"");     # Quote argument
-  }
-  return join(" ", @cmd);
-}
-
-##############################################################################
-#
-#  Ok, let's go.  We first need to parse arguments which are required by
-#  my_print_defaults so that we can execute it first, then later re-parse
-#  the command line to add any extra bits that we need.
-#
-##############################################################################
-
-my $opt = {};
-parse_arguments($opt, @ARGV);
-
-# ----------------------------------------------------------------------
-# We can now find my_print_defaults.  This script supports:
-#
-#   --srcdir=path pointing to compiled source tree
-#   --basedir=path pointing to installed binary location
-#
-# or default to compiled-in locations.
-# ----------------------------------------------------------------------
-
-my $print_defaults;
-
-if ( $opt->{srcdir} and $opt->{basedir} )
-{
-  error("Specify either --basedir or --srcdir, not both");
-}
-if ( $opt->{srcdir} )
-{
-  $opt->{builddir} = $opt->{srcdir} unless $opt->{builddir};
-  $print_defaults = "$opt->{builddir}/extra/my_print_defaults";
-}
-elsif ( $opt->{basedir} )
-{
-  $print_defaults = find_in_basedir($opt,"file","my_print_defaults","bin","extra");
-}
-else
-{
-  $print_defaults='@bindir@/my_print_defaults';
-}
-
--x $print_defaults or -f "$print_defaults.exe"
-  or cannot_find_file($print_defaults);
-
-# ----------------------------------------------------------------------
-# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
-# in the my.cfg file, then re-run to merge with command line arguments.
-# ----------------------------------------------------------------------
-
-my @default_options;
-my $cmd = quote_options($print_defaults,$opt->{'defaults-file'},
-                        "mysqld","mariadb","mysql_install_db","server","client-server");
-open(PIPE, "$cmd |") or error($opt,"can't run $cmd: $!");
-while ( <PIPE> )
-{
-  chomp;
-  next unless /\S/;
-  push(@default_options, $_);
-}
-close PIPE;
-$opt = {};                              # Reset the arguments FIXME ?
-parse_arguments($opt, @default_options);
-parse_arguments($opt, 'PICK-ARGS-FROM-ARGV', @ARGV);
-
-# ----------------------------------------------------------------------
-# Configure paths to support files
-# ----------------------------------------------------------------------
-
-# FIXME $extra_bindir is not used
-my ($bindir,$extra_bindir,$mysqld,$srcpkgdatadir,$buildpkgdatadir,$mysqld_opt,
-    $scriptdir);
-
-if ( $opt->{srcdir} )
-{
-  $opt->{basedir}  = $opt->{builddir};
-  $bindir          = "$opt->{basedir}/client";
-  $extra_bindir    = "$opt->{basedir}/extra";
-  $mysqld          = "$opt->{basedir}/sql/mysqld";
-  $mysqld_opt      = "--language=$opt->{srcdir}/sql/share/english";
-  $srcpkgdatadir   = "$opt->{srcdir}/scripts";
-  $buildpkgdatadir = "$opt->{builddir}/scripts";
-  $scriptdir       = "$opt->{srcdir}/scripts";
-}
-elsif ( $opt->{basedir} )
-{
-  $bindir         = "$opt->{basedir}/bin";
-  $extra_bindir   = $bindir;
-  $mysqld         = find_in_basedir($opt,"file",["mysqld-nt","mysqld"],
-                                    "libexec","sbin","bin") ||  # ,"sql"
-                    find_in_basedir($opt,"file","mysqld-nt",
-                                  "bin");  # ,"sql"
-  $srcpkgdatadir  = find_in_basedir($opt,"dir","fill_help_tables.sql",
-                                    "share","share/mysql");  # ,"scripts"
-  $buildpkgdir    = $srcpkgdatadir;
-  $scriptdir      = "$opt->{basedir}/scripts";
-}
-else
-{
-  $opt->{basedir}  = '@prefix@';
-  $bindir          = '@bindir@';
-  $extra_bindir    = $bindir;
-  $mysqld          = '@libexecdir@/mysqld';
-  $srcpkgdatadir   = '@pkgdatadir@';
-  $buildpkgdatadir = '@pkgdatadir@';
-  $scriptdir       = '@scriptdir@';
-}
-
-unless ( $opt->{ldata} )
-{
-  $opt->{ldata} = '@localstatedir@';
-}
-
-
-# ----------------------------------------------------------------------
-# Set up paths to SQL scripts required for bootstrap
-# ----------------------------------------------------------------------
-
-my $fill_help_tables     = "$srcpkgdatadir/fill_help_tables.sql";
-my $create_system_tables = "$srcpkgdatadir/mysql_system_tables.sql";
-my $fill_system_tables   = "$srcpkgdatadir/mysql_system_tables_data.sql";
-my $maria_add_gis_sp     = "$buildpkgdatadir/maria_add_gis_sp_bootstrap.sql";
-
-foreach my $f ( $fill_help_tables,$create_system_tables,$fill_system_tables,$maria_add_gis_sp )
-{
-  -f $f or cannot_find_file($f);
-}
-
--x $mysqld or -f "$mysqld.exe" or cannot_find_file($mysqld);
-# Try to determine the hostname
-my $hostname = hostname();
-
-# ----------------------------------------------------------------------
-# Check if hostname is valid
-# ----------------------------------------------------------------------
-
-my $resolved;
-if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
-{
-  my $resolveip = "$extra_bindir/resolveip";
-
-  $resolved = `$resolveip $hostname 2>&1`;
-  if ( $? != 0 )
-  {
-    $resolved=`$resolveip localhost 2>&1`;
-    if ( $? != 0 )
-    {
-      error($opt,
-            "Neither host '$hostname' nor 'localhost' could be looked up with",
-            "$resolveip",
-            "Please configure the 'hostname' command to return a correct",
-            "hostname.",
-            "If you want to solve this at a later stage, restart this script",
-            "with the --force option");
-    }
-    warning($opt,
-            "The host '$hostname' could not be looked up with $resolveip.",
-            "This probably means that your libc libraries are not 100 % compatible",
-            "with this binary MySQL version. The MySQL daemon, mysqld, should work",
-            "normally with the exception that host name resolving will not work.",
-            "This means that you should use IP addresses instead of hostnames",
-            "when specifying MySQL privileges !");
-  }
-}
-
-# FIXME what does this really mean....
-if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
-{
-  $hostname = (split(' ', $resolved))[5];
-}
-
-# ----------------------------------------------------------------------
-# Create database directories mysql & test
-# ----------------------------------------------------------------------
-
-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
-{
-  # FIXME not really the same as original "mkdir -p", but ok?
-  mkdir($dir, 0700) unless -d $dir;
-  chown($opt->{user}, $dir) if -w "/" and !$opt->{user};
-}
-
-push(@args, "--user=$opt->{user}") if $opt->{user};
-
-# ----------------------------------------------------------------------
-# Configure mysqld command line
-# ----------------------------------------------------------------------
-
-# FIXME use --init-file instead of --bootstrap ?!
-
-my $mysqld_bootstrap = $ENV{MYSQLD_BOOTSTRAP} || $mysqld;
-my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap,
-                                            $opt->{'defaults-file'},
-                                            $mysqld_opt,
-                                            "--bootstrap",
-                                            "--basedir=$opt->{basedir}",
-                                            "--datadir=$opt->{ldata}",
-                                            "--log-warnings=0",
-                                            "--max_allowed_packet=8M",
-                                            "--default-storage-engine=MyISAM",
-                                            "--net_buffer_length=16K",
-                                            "--enforce-storage-engine=\"\"",
-                                            @args,
-                                          );
-
-# ----------------------------------------------------------------------
-# Create the system and help tables by passing them to "mysqld --bootstrap"
-# ----------------------------------------------------------------------
-
-report_verbose_wait($opt,"Installing MySQL system tables...");
-
-open(SQL, $create_system_tables)
-  or error($opt,"can't open $create_system_tables for reading: $!");
-open(SQL2, $fill_system_tables)
-  or error($opt,"can't open $fill_system_tables for reading: $!");
-# FIXME  > /dev/null ?
-if ( open(PIPE, "| $mysqld_install_cmd_line") )
-{
-  print PIPE "use mysql;\n";
-  while ( <SQL> )
-  {
-    # When doing a "cross bootstrap" install, no reference to the current
-    # host should be added to the system tables.  So we filter out any
-    # lines which contain the current host name.
-    next if $opt->{'cross-bootstrap'} and /\@current_hostname/;
-
-    print PIPE $_;
-  }
-  while ( <SQL2> )
-  {
-    # TODO: make it similar to the above condition when we're sure 
-    #   @@hostname returns a fqdn
-    # When doing a "cross bootstrap" install, no reference to the current
-    # host should be added to the system tables.  So we filter out any
-    # lines which contain the current host name.
-    next if /\@current_hostname/;
-
-    print PIPE $_;
-  }
-  close PIPE;
-  close SQL;
-  close SQL2;
-
-  report_verbose($opt,"OK");
-
-  # ----------------------------------------------------------------------
-  # Pipe fill_help_tables.sql to "mysqld --bootstrap"
-  # ----------------------------------------------------------------------
-
-  report_verbose_wait($opt,"Filling help tables...");
-  open(SQL, $fill_help_tables)
-    or error($opt,"can't open $fill_help_tables for reading: $!");
-  # FIXME  > /dev/null ?
-  if ( open(PIPE, "| $mysqld_install_cmd_line") )
-  {
-    print PIPE "use mysql;\n";
-    while ( <SQL> )
-    {
-      print PIPE $_;
-    }
-    close PIPE;
-    close SQL;
-
-    report_verbose($opt,"OK");
-  }
-  else
-  {
-    warning($opt,"HELP FILES ARE NOT COMPLETELY INSTALLED!",
-                 "The \"HELP\" command might not work properly");
-  }
-
-  # ----------------------------------------------------------------------
-  # Pipe maria_add_gis_sp.sql to "mysqld --bootstrap"
-  # ----------------------------------------------------------------------
-
-  report_verbose_wait($opt,"Creating OpenGIS required SP-s...");
-  open(SQL, $maria_add_gis_sp)
-    or error($opt,"can't open $maria_add_gis_sp for reading: $!");
-  # FIXME  > /dev/null ?
-  if ( open(PIPE, "| $mysqld_install_cmd_line") )
-  {
-    print PIPE "use mysql;\n";
-    while ( <SQL> )
-    {
-      print PIPE $_;
-    }
-    close PIPE;
-    close SQL;
-
-    report_verbose($opt,"OK");
-  }
-  else
-  {
-    warning($opt,"OPENGIS REQUIRED SP-S WERE NOT COMPLETELY INSTALLED!",
-                 "GIS extentions might not work properly");
-  }
-
-  report_verbose($opt,"To start mysqld at boot time you have to copy",
-                      "support-files/mysql.server to the right place " .
-                      "for your system");
-
-  if ( !$opt->{'cross-bootstrap'} )
-  {
-    # This is not a true installation on a running system.  The end user must
-    # set a password after installing the data files on the real host system.
-    # At this point, there is no end user, so it does not make sense to print
-    # this reminder.
-    report($opt,
-           "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !",
-           "To do so, start the server, then issue the following commands:",
-           "",
-           "  $bindir/mysqladmin -u root password 'new-password'",
-           "  $bindir/mysqladmin -u root -h $hostname password 'new-password'",
-           "",
-           "Alternatively you can run:",
-           "",
-           "  $bindir/mysql_secure_installation",
-           "",
-           "which will also give you the option of removing the test",
-           "databases and anonymous user created by default.  This is",
-           "strongly recommended for production servers.",
-           "",
-           "See the manual for more instructions.");
-
-    if ( !$opt->{rpm} )
-    {
-      report($opt,
-             "You can start the MySQL daemon with:",
-             "",
-             "  cd " . '@prefix@' . " ; $bindir/mysqld_safe &",
-             "",
-             "You can test the MySQL daemon with mysql-test-run.pl",
-             "",
-             "  cd mysql-test ; perl mysql-test-run.pl");
-    }
-    report($opt,
-           "Please report any problems at http://bugs.mysql.com/",
-           "",
-           "The latest information about MySQL is available on the web at",
-           "",
-           "  http://www.mysql.com",
-           "",
-           "Support MySQL by buying support/licenses at http://shop.mysql.com");
-  }
-  exit 0
-}
-else
-{
-  error($opt,
-        "Installation of system tables failed!",
-         "",
-        "Examine the logs in $opt->{ldata} for more information.",
-        "You can try to start the mysqld daemon with:",
-        "$mysqld --skip-grant &",
-        "and use the command line tool",
-        "$bindir/mysql to connect to the mysql",
-        "database and look at the grant tables:",
-        "",
-        "shell> $bindir/mysql -u root mysql",
-        "mysql> show tables;",
-        "",
-        "Try 'mysqld --help' if you have problems with paths. Using --log",
-        "gives you a log in $opt->{ldata} that may be helpful.",
-        "",
-        "The latest information about MySQL is available on the web at",
-        "http://www.mysql.com",
-        "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
-        "and the manual section that describes problems on your OS.",
-        "Another information source is the MySQL email archive.",
-        "",
-        "Please check all of the above before submitting a bug report",
-        "at http://bugs.mysql.com/")
-}
-
-##############################################################################
-#
-#  Misc
-#
-##############################################################################
-
-sub report_verbose
-{
-  my $opt  = shift;
-  my $text = shift;
-
-  report_verbose_wait($opt, $text, @_);
-  print "\n\n";
-}
-
-sub report_verbose_wait
-{
-  my $opt  = shift;
-  my $text = shift;
-
-  if ( $opt->{verbose} or (!$opt->{rpm} and !$opt->{'cross-bootstrap'}) )
-  {
-    print "$text";
-    map {print "\n$_"} @_;
-  }
-}
-
-sub report
-{
-  my $opt  = shift;
-  my $text = shift;
-
-  print "$text\n";
-  map {print "$_\n"} @_;
-  print "\n";
-}
-
-sub error
-{
-  my $opt  = shift;
-  my $text = shift;
-
-  print "FATAL ERROR: $text\n";
-  map {print "$_\n"} @_;
-  exit 1;
-}
-
-sub warning
-{
-  my $opt  = shift;
-  my $text = shift;
-
-  print "WARNING: $text\n";
-  map {print "$_\n"} @_;
-  print "\n";
-}
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 5afeb6a6f47..d61ac97e580 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -37,9 +37,9 @@ force=0
 in_rpm=0
 ip_only=0
 cross_bootstrap=0
-install_params=""
 auth_root_authentication_method=normal
 auth_root_socket_user='root'
+skip_test_db=0
 
 usage()
 {
@@ -80,11 +80,10 @@ Usage: $0 [OPTIONS]
   --defaults-file=path Read only this configuration file.
   --rpm                For internal use.  This option is used by RPM files
                        during the MariaDB installation process.
-  --skip-auth-anonymous-user
-                       Do not install an unprivileged anonymous user.
   --skip-name-resolve  Use IP addresses rather than hostnames when creating
                        grant table entries.  This option can be useful if
                        your DNS does not work.
+  --skip-test-db       Don't install a test database.
   --srcdir=path        The path to the MariaDB source directory.  This option
                        uses the compiled binaries and support files within the
                        source tree, useful for if you don't want to install
@@ -168,9 +167,6 @@ parse_arguments()
         #
         # --windows is a deprecated alias
         cross_bootstrap=1 ;;
-      --skip-auth-anonymous-user)
-	install_params="$install_params
-SET @skip_auth_anonymous=1;" ;;
       --auth-root-authentication-method=normal)
 	auth_root_authentication_method=normal ;;
       --auth-root-authentication-method=socket)
@@ -179,6 +175,7 @@ SET @skip_auth_anonymous=1;" ;;
         usage ;;
       --auth-root-socket-user=*)
         auth_root_socket_user="$(parse_arg "$arg")" ;;
+      --skip-test-db) skip_test_db=1 ;;
 
       *)
         if test -n "$pick_args"
@@ -353,8 +350,9 @@ create_system_tables="$srcpkgdatadir/mysql_system_tables.sql"
 create_system_tables2="$srcpkgdatadir/mysql_performance_tables.sql"
 fill_system_tables="$srcpkgdatadir/mysql_system_tables_data.sql"
 maria_add_gis_sp="$buildpkgdatadir/maria_add_gis_sp_bootstrap.sql"
+mysql_test_db="$buildpkgdatadir/mysql_test_db.sql"
 
-for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp"
+for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp" "$mysql_test_db"
 do
   if test ! -f "$f"
   then
@@ -418,7 +416,7 @@ then
 fi
 
 # Create database directories
-for dir in "$ldata" "$ldata/mysql" "$ldata/test"
+for dir in "$ldata" "$ldata/mysql"
 do
   if test ! -d "$dir"
   then
@@ -467,20 +465,31 @@ mysqld_install_cmd_line()
   --net_buffer_length=16K
 }
 
+cat_sql()
+{
+  echo "use mysql;"
+
+  case "$auth_root_authentication_method" in
+    normal)
+      echo "SET @skip_auth_root_nopasswd=NULL;"
+      echo "SET @auth_root_socket=NULL;"
+      ;;
+    socket)
+      echo "SET @skip_auth_root_nopasswd=1;"
+      echo "SET @auth_root_socket='$auth_root_socket_user';"
+      ;;
+  esac
+
+  cat "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$fill_help_tables" "$maria_add_gis_sp"
+  if test "$skip_test_db" -eq 0
+  then
+    cat "$mysql_test_db"
+  fi
+}
 
 # Create the system and help tables by passing them to "mysqld --bootstrap"
 s_echo "Installing MariaDB/MySQL system tables in '$ldata' ..."
-case "$auth_root_authentication_method" in
-  normal)
-    install_params="$install_params
-SET @skip_auth_root_nopasswd=NULL;
-SET @auth_root_socket=NULL;" ;;
-  socket)
-    install_params="$install_params
-SET @skip_auth_root_nopasswd=1;
-SET @auth_root_socket='$auth_root_socket_user';" ;;
-esac
-if { echo "use mysql;$install_params"; cat "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$fill_help_tables" "$maria_add_gis_sp"; } | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null
+if cat_sql | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null
 then
   s_echo "OK"
 else
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql
index 4821b18bcbf..0fbbfe4701f 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql
@@ -26,21 +26,10 @@
 -- a plain character
 SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname;
 
-
--- Fill "db" table with default grants for anyone to
--- access database 'test' and 'test_%' if "db" table didn't exist
-CREATE TEMPORARY TABLE tmp_db LIKE db;
-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
-INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
-DROP TABLE tmp_db;
-
-
 -- Fill "user" table with default users allowing root access
 -- from local machine if "user" table didn't exist before
 CREATE TEMPORARY TABLE tmp_user_nopasswd LIKE user;
 CREATE TEMPORARY TABLE tmp_user_socket LIKE user;
-CREATE TEMPORARY TABLE tmp_user_anonymous LIKE user;
 -- Classic passwordless root account.
 INSERT INTO tmp_user_nopasswd VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N', 'N','', 0);
 REPLACE INTO tmp_user_nopasswd SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N','',0 FROM dual WHERE @current_hostname != 'localhost';
@@ -48,14 +37,10 @@ REPLACE INTO tmp_user_nopasswd VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y'
 REPLACE INTO tmp_user_nopasswd VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0);
 -- More secure root account using unix sucket auth.
 INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root'),'','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N','', 0);
--- Anonymous user with no privileges.
-INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost','');
-INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
 
 INSERT INTO user SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @skip_auth_root_nopasswd IS NULL;
 INSERT INTO user SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL;
-INSERT INTO user SELECT * FROM tmp_user_anonymous WHERE @had_user_table=0 AND @skip_auth_anonymous IS NULL;
-DROP TABLE tmp_user_nopasswd, tmp_user_socket, tmp_user_anonymous;
+DROP TABLE tmp_user_nopasswd, tmp_user_socket;
 
 CREATE TEMPORARY TABLE tmp_proxies_priv LIKE proxies_priv;
 INSERT INTO tmp_proxies_priv VALUES ('localhost', 'root', '', '', TRUE, '', now());
diff --git a/scripts/mysql_test_db.sql b/scripts/mysql_test_db.sql
new file mode 100644
index 00000000000..c1bb3661ec3
--- /dev/null
+++ b/scripts/mysql_test_db.sql
@@ -0,0 +1,31 @@
+-- Copyright (c) 2018 MariaDB Foundation
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
+
+-- Fill "db" table with default grants for anyone to
+-- access database 'test' and 'test_%' if "db" table didn't exist
+CREATE TEMPORARY TABLE tmp_db LIKE db;
+INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
+INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
+INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+DROP TABLE tmp_db;
+
+-- Anonymous user with no privileges.
+CREATE TEMPORARY TABLE tmp_user_anonymous LIKE user;
+INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost','');
+INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
+INSERT INTO user SELECT * FROM tmp_user_anonymous WHERE @had_user_table=0;
+DROP TABLE tmp_user_anonymous;
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index ca5c7c87bf5..7253f7ba447 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -469,12 +469,13 @@ IF(WIN32)
   ADD_CUSTOM_COMMAND(OUTPUT    
     ${my_bootstrap_sql}
     COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_SOURCE_DIR}/scripts
-    cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql+mysql_performance_tables.sql ${native_outfile}
+    cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql+mysql_performance_tables.sql+mysql_test_db.sql ${native_outfile}
     DEPENDS
     ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables.sql
     ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables_data.sql
     ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql
     ${CMAKE_SOURCE_DIR}/scripts/mysql_performance_tables.sql
+    ${CMAKE_SOURCE_DIR}/scripts/mysql_test_db.sql
   )
 
   ADD_CUSTOM_COMMAND(
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index c76b279048b..0483c7f5fbf 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.cc
@@ -545,7 +545,6 @@ static int create_db_instance()
   }
 
   CreateDirectory("mysql",NULL);
-  CreateDirectory("test", NULL);
 
   /*
     Set data directory permissions for both current user and 
diff --git a/storage/connect/mysql-test/connect/r/grant.result b/storage/connect/mysql-test/connect/r/grant.result
index 118d75408be..c43ad3a5b79 100644
--- a/storage/connect/mysql-test/connect/r/grant.result
+++ b/storage/connect/mysql-test/connect/r/grant.result
@@ -26,7 +26,7 @@ fname VARCHAR(256) NOT NULL,
 ftype CHAR(4) NOT NULL,
 size DOUBLE(12,0) NOT NULL flag=5
 ) ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.*';
-SELECT fname, ftype, size FROM t1 WHERE size>0;
+SELECT fname, ftype, size FROM t1 WHERE size>0 AND ftype!='.opt';
 fname	ftype	size
 t1	.frm	1081
 connection user;
diff --git a/storage/connect/mysql-test/connect/t/grant.test b/storage/connect/mysql-test/connect/t/grant.test
index 738f156d8a4..c4a91904e73 100644
--- a/storage/connect/mysql-test/connect/t/grant.test
+++ b/storage/connect/mysql-test/connect/t/grant.test
@@ -28,7 +28,7 @@ CREATE TABLE t1 (
 ) ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.*';
 # "size>0" to skip directory names on Windows
 --replace_result $MYSQLD_DATADIR DATADIR/
-SELECT fname, ftype, size FROM t1 WHERE size>0;
+SELECT fname, ftype, size FROM t1 WHERE size>0 AND ftype!='.opt';
 
 --connection user
 SELECT user();
diff --git a/storage/tokudb/mysql-test/tokudb/r/dir_per_db_rename_to_nonexisting_schema.result b/storage/tokudb/mysql-test/tokudb/r/dir_per_db_rename_to_nonexisting_schema.result
index 74148bd4e74..992f380591f 100644
--- a/storage/tokudb/mysql-test/tokudb/r/dir_per_db_rename_to_nonexisting_schema.result
+++ b/storage/tokudb/mysql-test/tokudb/r/dir_per_db_rename_to_nonexisting_schema.result
@@ -6,6 +6,7 @@ CREATE DATABASE new_db;
 CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY NOT NULL) ENGINE=tokudb;
 ALTER TABLE test.t1 RENAME new_db.t1;
 The content of "test" directory:
+db.opt
 The content of "new_db" directory:
 db.opt
 t1.frm
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result
index 7186da6f69a..12dfab60b66 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_debug_sync_tokudb.result
@@ -58,6 +58,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=TokuDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0
  PARTITION BY RANGE (`a`)
 (PARTITION `p0` VALUES LESS THAN MAXVALUE ENGINE = TokuDB)
+db.opt
 t1.frm
 t1.par
 SET DEBUG_SYNC='before_open_in_get_all_tables SIGNAL parked WAIT_FOR open';
@@ -83,6 +84,7 @@ connection default;
 TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	PARTITION_ORDINAL_POSITION	PARTITION_DESCRIPTION	TABLE_ROWS
 test	t1	p0	1	10	1
 test	t1	p10	2	MAXVALUE	3
+db.opt
 t1.frm
 t1.par
 SHOW CREATE TABLE t1;
@@ -100,4 +102,5 @@ a
 21
 33
 drop table t1;
+db.opt
 SET DEBUG_SYNC = 'RESET';
author	Sergey Vojtovich <svoj@mariadb.org>	2018-04-11 16:50:32 +0400
committer	Sergey Vojtovich <svoj@mariadb.org>	2018-04-30 19:34:08 +0400
commit	9a8498066865b508239b36853403f2700800af2b (patch)
tree	265e8c8abb576d57960a8f43ac6e5b4e0b9f9bf2
parent	8bbcc0d5050dcbd44c0bc396c6b1acd488d3dfe2 (diff)
download	mariadb-git-9a8498066865b508239b36853403f2700800af2b.tar.gz