110 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fd695d1129f..fdf34c1c9ec 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -163,11 +163,14 @@ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
 
 my $DEFAULT_SUITES= join(',', map { "$_-" } qw(
     main
+    archive
     binlog
+    csv
     federated
     funcs_1
     funcs_2
     handler
+    heap
     innodb
     maria
     optimizer_unfixed_bugs
diff --git a/mysql-test/r/archive-big.result b/mysql-test/suite/archive/archive-big.result
index 7dbdb490017..7dbdb490017 100644
--- a/mysql-test/r/archive-big.result
+++ b/mysql-test/suite/archive/archive-big.result
diff --git a/mysql-test/t/archive-big.test b/mysql-test/suite/archive/archive-big.test
index 414b689b180..414b689b180 100644
--- a/mysql-test/t/archive-big.test
+++ b/mysql-test/suite/archive/archive-big.test
diff --git a/mysql-test/r/archive.result b/mysql-test/suite/archive/archive.result
index b4c4aab621d..b4c4aab621d 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/suite/archive/archive.result
diff --git a/mysql-test/t/archive.test b/mysql-test/suite/archive/archive.test
index 5dd85bf1aba..5dd85bf1aba 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/suite/archive/archive.test
diff --git a/mysql-test/r/archive_bitfield.result b/mysql-test/suite/archive/archive_bitfield.result
index 7e3b82a5caf..7e3b82a5caf 100644
--- a/mysql-test/r/archive_bitfield.result
+++ b/mysql-test/suite/archive/archive_bitfield.result
diff --git a/mysql-test/t/archive_bitfield.test b/mysql-test/suite/archive/archive_bitfield.test
index 2e90ce39708..2e90ce39708 100644
--- a/mysql-test/t/archive_bitfield.test
+++ b/mysql-test/suite/archive/archive_bitfield.test
diff --git a/mysql-test/r/archive_debug.result b/mysql-test/suite/archive/archive_debug.result
index 7bc6a113217..7bc6a113217 100644
--- a/mysql-test/r/archive_debug.result
+++ b/mysql-test/suite/archive/archive_debug.result
diff --git a/mysql-test/t/archive_debug.test b/mysql-test/suite/archive/archive_debug.test
index b107826784b..b107826784b 100644
--- a/mysql-test/t/archive_debug.test
+++ b/mysql-test/suite/archive/archive_debug.test
diff --git a/mysql-test/r/archive_gis.result b/mysql-test/suite/archive/archive_gis.result
index 97f48407db2..97f48407db2 100644
--- a/mysql-test/r/archive_gis.result
+++ b/mysql-test/suite/archive/archive_gis.result
diff --git a/mysql-test/t/archive_gis.test b/mysql-test/suite/archive/archive_gis.test
index ffbad923173..ffbad923173 100644
--- a/mysql-test/t/archive_gis.test
+++ b/mysql-test/suite/archive/archive_gis.test
diff --git a/mysql-test/r/archive_plugin.result b/mysql-test/suite/archive/archive_plugin.result
index 90c1f10bf19..90c1f10bf19 100644
--- a/mysql-test/r/archive_plugin.result
+++ b/mysql-test/suite/archive/archive_plugin.result
diff --git a/mysql-test/t/archive_plugin.test b/mysql-test/suite/archive/archive_plugin.test
index ba80652fb02..ba80652fb02 100644
--- a/mysql-test/t/archive_plugin.test
+++ b/mysql-test/suite/archive/archive_plugin.test
diff --git a/mysql-test/r/mysqlhotcopy_archive.result b/mysql-test/suite/archive/mysqlhotcopy_archive.result
index bea78597336..bea78597336 100644
--- a/mysql-test/r/mysqlhotcopy_archive.result
+++ b/mysql-test/suite/archive/mysqlhotcopy_archive.result
diff --git a/mysql-test/t/mysqlhotcopy_archive.test b/mysql-test/suite/archive/mysqlhotcopy_archive.test
index 4bfad3ce138..4bfad3ce138 100644
--- a/mysql-test/t/mysqlhotcopy_archive.test
+++ b/mysql-test/suite/archive/mysqlhotcopy_archive.test
diff --git a/mysql-test/r/partition_archive.result b/mysql-test/suite/archive/partition_archive.result
index 186a7930251..186a7930251 100644
--- a/mysql-test/r/partition_archive.result
+++ b/mysql-test/suite/archive/partition_archive.result
diff --git a/mysql-test/t/partition_archive.test b/mysql-test/suite/archive/partition_archive.test
index 6f6a26c018a..6f6a26c018a 100644
--- a/mysql-test/t/partition_archive.test
+++ b/mysql-test/suite/archive/partition_archive.test
diff --git a/mysql-test/suite/archive/suite.pm b/mysql-test/suite/archive/suite.pm
new file mode 100644
index 00000000000..eb2ff9f8e26
--- /dev/null
+++ b/mysql-test/suite/archive/suite.pm
@@ -0,0 +1,9 @@
+package My::Suite::Archive;
+
+@ISA = qw(My::Suite);
+
+return ("Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
+        $::mysqld_variables{'archive'} eq "ON");
+
+bless { };
+
diff --git a/mysql-test/r/csv.result b/mysql-test/suite/csv/csv.result
index b4da56cda6f..b4da56cda6f 100644
--- a/mysql-test/r/csv.result
+++ b/mysql-test/suite/csv/csv.result
diff --git a/mysql-test/t/csv.test b/mysql-test/suite/csv/csv.test
index 148964d8d96..148964d8d96 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/suite/csv/csv.test
diff --git a/mysql-test/r/csv_alter_table.result b/mysql-test/suite/csv/csv_alter_table.result
index b406e40b15d..b406e40b15d 100644
--- a/mysql-test/r/csv_alter_table.result
+++ b/mysql-test/suite/csv/csv_alter_table.result
diff --git a/mysql-test/t/csv_alter_table.test b/mysql-test/suite/csv/csv_alter_table.test
index 0093a1d10a7..0093a1d10a7 100644
--- a/mysql-test/t/csv_alter_table.test
+++ b/mysql-test/suite/csv/csv_alter_table.test
diff --git a/mysql-test/r/csv_not_null.result b/mysql-test/suite/csv/csv_not_null.result
index aed9bcb1587..aed9bcb1587 100644
--- a/mysql-test/r/csv_not_null.result
+++ b/mysql-test/suite/csv/csv_not_null.result
diff --git a/mysql-test/t/csv_not_null.test b/mysql-test/suite/csv/csv_not_null.test
index bebea53b2f7..bebea53b2f7 100644
--- a/mysql-test/t/csv_not_null.test
+++ b/mysql-test/suite/csv/csv_not_null.test
diff --git a/mysql-test/r/heap.result b/mysql-test/suite/heap/heap.result
index f058c9f9c72..f058c9f9c72 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/suite/heap/heap.result
diff --git a/mysql-test/t/heap.test b/mysql-test/suite/heap/heap.test
index 7d56425799a..7d56425799a 100644
--- a/mysql-test/t/heap.test
+++ b/mysql-test/suite/heap/heap.test
diff --git a/mysql-test/r/heap_auto_increment.result b/mysql-test/suite/heap/heap_auto_increment.result
index 5b04a77e9eb..5b04a77e9eb 100644
--- a/mysql-test/r/heap_auto_increment.result
+++ b/mysql-test/suite/heap/heap_auto_increment.result
diff --git a/mysql-test/t/heap_auto_increment.test b/mysql-test/suite/heap/heap_auto_increment.test
index 016bc946209..016bc946209 100644
--- a/mysql-test/t/heap_auto_increment.test
+++ b/mysql-test/suite/heap/heap_auto_increment.test
diff --git a/mysql-test/r/heap_btree.result b/mysql-test/suite/heap/heap_btree.result
index 12a011778c6..12a011778c6 100644
--- a/mysql-test/r/heap_btree.result
+++ b/mysql-test/suite/heap/heap_btree.result
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/suite/heap/heap_btree.test
index 02c09f52263..02c09f52263 100644
--- a/mysql-test/t/heap_btree.test
+++ b/mysql-test/suite/heap/heap_btree.test
diff --git a/mysql-test/r/heap_hash.result b/mysql-test/suite/heap/heap_hash.result
index 453bfc0c165..453bfc0c165 100644
--- a/mysql-test/r/heap_hash.result
+++ b/mysql-test/suite/heap/heap_hash.result
diff --git a/mysql-test/t/heap_hash.test b/mysql-test/suite/heap/heap_hash.test
index 80ae01e9547..80ae01e9547 100644
--- a/mysql-test/t/heap_hash.test
+++ b/mysql-test/suite/heap/heap_hash.test
diff --git a/mysql-test/suite/maria/t/compat_aliases-master.opt b/mysql-test/suite/maria/compat_aliases-master.opt
index a1dcde828cd..a1dcde828cd 100644
--- a/mysql-test/suite/maria/t/compat_aliases-master.opt
+++ b/mysql-test/suite/maria/compat_aliases-master.opt
diff --git a/mysql-test/suite/maria/r/group_commit.result b/mysql-test/suite/maria/group_commit.result
index 4fb85b912ec..4fb85b912ec 100644
--- a/mysql-test/suite/maria/r/group_commit.result
+++ b/mysql-test/suite/maria/group_commit.result
diff --git a/mysql-test/suite/maria/t/group_commit.test b/mysql-test/suite/maria/group_commit.test
index 38b2c9d3bf4..38b2c9d3bf4 100644
--- a/mysql-test/suite/maria/t/group_commit.test
+++ b/mysql-test/suite/maria/group_commit.test
diff --git a/mysql-test/suite/maria/r/locking.result b/mysql-test/suite/maria/locking.result
index 772e43f5983..772e43f5983 100644
--- a/mysql-test/suite/maria/r/locking.result
+++ b/mysql-test/suite/maria/locking.result
diff --git a/mysql-test/suite/maria/t/locking.test b/mysql-test/suite/maria/locking.test
index c20ca33e162..c20ca33e162 100644
--- a/mysql-test/suite/maria/t/locking.test
+++ b/mysql-test/suite/maria/locking.test
diff --git a/mysql-test/suite/maria/r/maria-autozerofill.result b/mysql-test/suite/maria/maria-autozerofill.result
index 22856fe54b0..22856fe54b0 100644
--- a/mysql-test/suite/maria/r/maria-autozerofill.result
+++ b/mysql-test/suite/maria/maria-autozerofill.result
diff --git a/mysql-test/suite/maria/t/maria-autozerofill.test b/mysql-test/suite/maria/maria-autozerofill.test
index 9bb2782105a..9bb2782105a 100644
--- a/mysql-test/suite/maria/t/maria-autozerofill.test
+++ b/mysql-test/suite/maria/maria-autozerofill.test
diff --git a/mysql-test/suite/maria/r/maria-big.result b/mysql-test/suite/maria/maria-big.result
index cb6e02df00e..cb6e02df00e 100644
--- a/mysql-test/suite/maria/r/maria-big.result
+++ b/mysql-test/suite/maria/maria-big.result
diff --git a/mysql-test/suite/maria/t/maria-big.test b/mysql-test/suite/maria/maria-big.test
index 5b4b6c4defe..5b4b6c4defe 100644
--- a/mysql-test/suite/maria/t/maria-big.test
+++ b/mysql-test/suite/maria/maria-big.test
diff --git a/mysql-test/suite/maria/r/maria-big2.result b/mysql-test/suite/maria/maria-big2.result
index 3e4c6973997..3e4c6973997 100644
--- a/mysql-test/suite/maria/r/maria-big2.result
+++ b/mysql-test/suite/maria/maria-big2.result
diff --git a/mysql-test/suite/maria/t/maria-big2.test b/mysql-test/suite/maria/maria-big2.test
index d138892fe3c..d138892fe3c 100644
--- a/mysql-test/suite/maria/t/maria-big2.test
+++ b/mysql-test/suite/maria/maria-big2.test
diff --git a/mysql-test/suite/maria/r/maria-connect.result b/mysql-test/suite/maria/maria-connect.result
index ed626a003f5..ed626a003f5 100644
--- a/mysql-test/suite/maria/r/maria-connect.result
+++ b/mysql-test/suite/maria/maria-connect.result
diff --git a/mysql-test/suite/maria/t/maria-connect.test b/mysql-test/suite/maria/maria-connect.test
index a1e9bbce4f2..a1e9bbce4f2 100644
--- a/mysql-test/suite/maria/t/maria-connect.test
+++ b/mysql-test/suite/maria/maria-connect.test
diff --git a/mysql-test/suite/maria/t/maria-gis-recovery.opt b/mysql-test/suite/maria/maria-gis-recovery.opt
index 58d0d012c54..58d0d012c54 100644
--- a/mysql-test/suite/maria/t/maria-gis-recovery.opt
+++ b/mysql-test/suite/maria/maria-gis-recovery.opt
diff --git a/mysql-test/suite/maria/r/maria-gis-recovery.result b/mysql-test/suite/maria/maria-gis-recovery.result
index d1088dd1ba0..d1088dd1ba0 100644
--- a/mysql-test/suite/maria/r/maria-gis-recovery.result
+++ b/mysql-test/suite/maria/maria-gis-recovery.result
diff --git a/mysql-test/suite/maria/t/maria-gis-recovery.test b/mysql-test/suite/maria/maria-gis-recovery.test
index c40cc3788de..c40cc3788de 100644
--- a/mysql-test/suite/maria/t/maria-gis-recovery.test
+++ b/mysql-test/suite/maria/maria-gis-recovery.test
diff --git a/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
index 843e5ae3d37..843e5ae3d37 100644
--- a/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
+++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.result
diff --git a/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test b/mysql-test/suite/maria/maria-gis-rtree-dynamic.test
index 166c88cab36..166c88cab36 100644
--- a/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
+++ b/mysql-test/suite/maria/maria-gis-rtree-dynamic.test
diff --git a/mysql-test/suite/maria/r/maria-gis-rtree-trans.result b/mysql-test/suite/maria/maria-gis-rtree-trans.result
index 8ccc1f5bfdf..8ccc1f5bfdf 100644
--- a/mysql-test/suite/maria/r/maria-gis-rtree-trans.result
+++ b/mysql-test/suite/maria/maria-gis-rtree-trans.result
diff --git a/mysql-test/suite/maria/t/maria-gis-rtree-trans.test b/mysql-test/suite/maria/maria-gis-rtree-trans.test
index ec1573c3e29..ec1573c3e29 100644
--- a/mysql-test/suite/maria/t/maria-gis-rtree-trans.test
+++ b/mysql-test/suite/maria/maria-gis-rtree-trans.test
diff --git a/mysql-test/suite/maria/r/maria-gis-rtree.result b/mysql-test/suite/maria/maria-gis-rtree.result
index 9945daae75e..9945daae75e 100644
--- a/mysql-test/suite/maria/r/maria-gis-rtree.result
+++ b/mysql-test/suite/maria/maria-gis-rtree.result
diff --git a/mysql-test/suite/maria/t/maria-gis-rtree.test b/mysql-test/suite/maria/maria-gis-rtree.test
index beffbfc99fe..beffbfc99fe 100644
--- a/mysql-test/suite/maria/t/maria-gis-rtree.test
+++ b/mysql-test/suite/maria/maria-gis-rtree.test
diff --git a/mysql-test/suite/maria/r/maria-mvcc.result b/mysql-test/suite/maria/maria-mvcc.result
index 671b1bbf53c..671b1bbf53c 100644
--- a/mysql-test/suite/maria/r/maria-mvcc.result
+++ b/mysql-test/suite/maria/maria-mvcc.result
diff --git a/mysql-test/suite/maria/t/maria-mvcc.test b/mysql-test/suite/maria/maria-mvcc.test
index 8be8e2ea630..8be8e2ea630 100644
--- a/mysql-test/suite/maria/t/maria-mvcc.test
+++ b/mysql-test/suite/maria/maria-mvcc.test
diff --git a/mysql-test/suite/maria/r/maria-no-logging.result b/mysql-test/suite/maria/maria-no-logging.result
index 9c50245d05d..9c50245d05d 100644
--- a/mysql-test/suite/maria/r/maria-no-logging.result
+++ b/mysql-test/suite/maria/maria-no-logging.result
diff --git a/mysql-test/suite/maria/t/maria-no-logging.test b/mysql-test/suite/maria/maria-no-logging.test
index 7055a842510..7055a842510 100644
--- a/mysql-test/suite/maria/t/maria-no-logging.test
+++ b/mysql-test/suite/maria/maria-no-logging.test
diff --git a/mysql-test/suite/maria/r/maria-page-checksum.result b/mysql-test/suite/maria/maria-page-checksum.result
index c4d1b71e33a..c4d1b71e33a 100644
--- a/mysql-test/suite/maria/r/maria-page-checksum.result
+++ b/mysql-test/suite/maria/maria-page-checksum.result
diff --git a/mysql-test/suite/maria/t/maria-page-checksum.test b/mysql-test/suite/maria/maria-page-checksum.test
index 8dd68fce245..8dd68fce245 100644
--- a/mysql-test/suite/maria/t/maria-page-checksum.test
+++ b/mysql-test/suite/maria/maria-page-checksum.test
diff --git a/mysql-test/suite/maria/r/maria-partitioning.result b/mysql-test/suite/maria/maria-partitioning.result
index 840c7c0b3b4..840c7c0b3b4 100644
--- a/mysql-test/suite/maria/r/maria-partitioning.result
+++ b/mysql-test/suite/maria/maria-partitioning.result
diff --git a/mysql-test/suite/maria/t/maria-partitioning.test b/mysql-test/suite/maria/maria-partitioning.test
index 612c44be57e..612c44be57e 100644
--- a/mysql-test/suite/maria/t/maria-partitioning.test
+++ b/mysql-test/suite/maria/maria-partitioning.test
diff --git a/mysql-test/suite/maria/r/maria-preload.result b/mysql-test/suite/maria/maria-preload.result
index a693b6768ac..a693b6768ac 100644
--- a/mysql-test/suite/maria/r/maria-preload.result
+++ b/mysql-test/suite/maria/maria-preload.result
diff --git a/mysql-test/suite/maria/t/maria-preload.test b/mysql-test/suite/maria/maria-preload.test
index efac10ecbec..efac10ecbec 100644
--- a/mysql-test/suite/maria/t/maria-preload.test
+++ b/mysql-test/suite/maria/maria-preload.test
diff --git a/mysql-test/suite/maria/r/maria-purge.result b/mysql-test/suite/maria/maria-purge.result
index 382f8aedf89..382f8aedf89 100644
--- a/mysql-test/suite/maria/r/maria-purge.result
+++ b/mysql-test/suite/maria/maria-purge.result
diff --git a/mysql-test/suite/maria/t/maria-purge.test b/mysql-test/suite/maria/maria-purge.test
index ad41fa0f5d0..ad41fa0f5d0 100644
--- a/mysql-test/suite/maria/t/maria-purge.test
+++ b/mysql-test/suite/maria/maria-purge.test
diff --git a/mysql-test/suite/maria/t/maria-recover-master.opt b/mysql-test/suite/maria/maria-recover-master.opt
index 7582a381a32..7582a381a32 100644
--- a/mysql-test/suite/maria/t/maria-recover-master.opt
+++ b/mysql-test/suite/maria/maria-recover-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recover.result b/mysql-test/suite/maria/maria-recover.result
index 9b84c47720a..9b84c47720a 100644
--- a/mysql-test/suite/maria/r/maria-recover.result
+++ b/mysql-test/suite/maria/maria-recover.result
diff --git a/mysql-test/suite/maria/t/maria-recover.test b/mysql-test/suite/maria/maria-recover.test
index 56259ad9a31..56259ad9a31 100644
--- a/mysql-test/suite/maria/t/maria-recover.test
+++ b/mysql-test/suite/maria/maria-recover.test
diff --git a/mysql-test/suite/maria/t/maria-recovery-big-master.opt b/mysql-test/suite/maria/maria-recovery-big-master.opt
index d24a11c924f..d24a11c924f 100644
--- a/mysql-test/suite/maria/t/maria-recovery-big-master.opt
+++ b/mysql-test/suite/maria/maria-recovery-big-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery-big.result b/mysql-test/suite/maria/maria-recovery-big.result
index ae4010c7a86..ae4010c7a86 100644
--- a/mysql-test/suite/maria/r/maria-recovery-big.result
+++ b/mysql-test/suite/maria/maria-recovery-big.result
diff --git a/mysql-test/suite/maria/t/maria-recovery-big.test b/mysql-test/suite/maria/maria-recovery-big.test
index 4bad3913e58..4bad3913e58 100644
--- a/mysql-test/suite/maria/t/maria-recovery-big.test
+++ b/mysql-test/suite/maria/maria-recovery-big.test
diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt b/mysql-test/suite/maria/maria-recovery-bitmap-master.opt
index 425fda95086..425fda95086 100644
--- a/mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
+++ b/mysql-test/suite/maria/maria-recovery-bitmap-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/maria-recovery-bitmap.result
index e3697334239..e3697334239 100644
--- a/mysql-test/suite/maria/r/maria-recovery-bitmap.result
+++ b/mysql-test/suite/maria/maria-recovery-bitmap.result
diff --git a/mysql-test/suite/maria/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/maria-recovery-bitmap.test
index 4c7956fbc30..4c7956fbc30 100644
--- a/mysql-test/suite/maria/t/maria-recovery-bitmap.test
+++ b/mysql-test/suite/maria/maria-recovery-bitmap.test
diff --git a/mysql-test/suite/maria/t/maria-recovery-master.opt b/mysql-test/suite/maria/maria-recovery-master.opt
index 58d0d012c54..58d0d012c54 100644
--- a/mysql-test/suite/maria/t/maria-recovery-master.opt
+++ b/mysql-test/suite/maria/maria-recovery-master.opt
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt b/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt
index 425fda95086..425fda95086 100644
--- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
+++ b/mysql-test/suite/maria/maria-recovery-rtree-ft-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/maria-recovery-rtree-ft.result
index 030421ae06a..030421ae06a 100644
--- a/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
+++ b/mysql-test/suite/maria/maria-recovery-rtree-ft.result
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/maria-recovery-rtree-ft.test
index 11050ad676a..11050ad676a 100644
--- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
+++ b/mysql-test/suite/maria/maria-recovery-rtree-ft.test
diff --git a/mysql-test/suite/maria/r/maria-recovery.result b/mysql-test/suite/maria/maria-recovery.result
index 86e756badec..86e756badec 100644
--- a/mysql-test/suite/maria/r/maria-recovery.result
+++ b/mysql-test/suite/maria/maria-recovery.result
diff --git a/mysql-test/suite/maria/t/maria-recovery.test b/mysql-test/suite/maria/maria-recovery.test
index b0f01f37d0d..b0f01f37d0d 100644
--- a/mysql-test/suite/maria/t/maria-recovery.test
+++ b/mysql-test/suite/maria/maria-recovery.test
diff --git a/mysql-test/suite/maria/t/maria-recovery2-master.opt b/mysql-test/suite/maria/maria-recovery2-master.opt
index 9b232472a24..9b232472a24 100644
--- a/mysql-test/suite/maria/t/maria-recovery2-master.opt
+++ b/mysql-test/suite/maria/maria-recovery2-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/maria-recovery2.result
index 149ce5a01af..149ce5a01af 100644
--- a/mysql-test/suite/maria/r/maria-recovery2.result
+++ b/mysql-test/suite/maria/maria-recovery2.result
diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/maria-recovery2.test
index 8d27d9aaaac..8d27d9aaaac 100644
--- a/mysql-test/suite/maria/t/maria-recovery2.test
+++ b/mysql-test/suite/maria/maria-recovery2.test
diff --git a/mysql-test/suite/maria/t/maria-recovery3-master.opt b/mysql-test/suite/maria/maria-recovery3-master.opt
index 58d0d012c54..58d0d012c54 100644
--- a/mysql-test/suite/maria/t/maria-recovery3-master.opt
+++ b/mysql-test/suite/maria/maria-recovery3-master.opt
diff --git a/mysql-test/suite/maria/r/maria-recovery3.result b/mysql-test/suite/maria/maria-recovery3.result
index d71a3f6c00a..d71a3f6c00a 100644
--- a/mysql-test/suite/maria/r/maria-recovery3.result
+++ b/mysql-test/suite/maria/maria-recovery3.result
diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/maria-recovery3.test
index e4bc73edc57..e4bc73edc57 100644
--- a/mysql-test/suite/maria/t/maria-recovery3.test
+++ b/mysql-test/suite/maria/maria-recovery3.test
diff --git a/mysql-test/suite/maria/r/maria-ucs2.result b/mysql-test/suite/maria/maria-ucs2.result
index e7258f21d4f..e7258f21d4f 100644
--- a/mysql-test/suite/maria/r/maria-ucs2.result
+++ b/mysql-test/suite/maria/maria-ucs2.result
diff --git a/mysql-test/suite/maria/t/maria-ucs2.test b/mysql-test/suite/maria/maria-ucs2.test
index fed67d780e9..fed67d780e9 100644
--- a/mysql-test/suite/maria/t/maria-ucs2.test
+++ b/mysql-test/suite/maria/maria-ucs2.test
diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/maria.result
index c68a8871f83..c68a8871f83 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/maria.result
diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/maria.test
index b371394b2b3..b371394b2b3 100644
--- a/mysql-test/suite/maria/t/maria.test
+++ b/mysql-test/suite/maria/maria.test
diff --git a/mysql-test/suite/maria/r/maria2.result b/mysql-test/suite/maria/maria2.result
index a0ec440b662..a0ec440b662 100644
--- a/mysql-test/suite/maria/r/maria2.result
+++ b/mysql-test/suite/maria/maria2.result
diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/maria2.test
index df691569e05..df691569e05 100644
--- a/mysql-test/suite/maria/t/maria2.test
+++ b/mysql-test/suite/maria/maria2.test
diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/maria3.result
index 37613875f38..37613875f38 100644
--- a/mysql-test/suite/maria/r/maria3.result
+++ b/mysql-test/suite/maria/maria3.result
diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/maria3.test
index f1d95a15ba5..f1d95a15ba5 100644
--- a/mysql-test/suite/maria/t/maria3.test
+++ b/mysql-test/suite/maria/maria3.test
diff --git a/mysql-test/suite/maria/r/maria_notembedded.result b/mysql-test/suite/maria/maria_notembedded.result
index f9d8bbfedc8..f9d8bbfedc8 100644
--- a/mysql-test/suite/maria/r/maria_notembedded.result
+++ b/mysql-test/suite/maria/maria_notembedded.result
diff --git a/mysql-test/suite/maria/t/maria_notembedded.test b/mysql-test/suite/maria/maria_notembedded.test
index f1d71e90354..f1d71e90354 100644
--- a/mysql-test/suite/maria/t/maria_notembedded.test
+++ b/mysql-test/suite/maria/maria_notembedded.test
diff --git a/mysql-test/suite/maria/r/maria_partition.result b/mysql-test/suite/maria/maria_partition.result
index 372230c0b71..372230c0b71 100644
--- a/mysql-test/suite/maria/r/maria_partition.result
+++ b/mysql-test/suite/maria/maria_partition.result
diff --git a/mysql-test/suite/maria/t/maria_partition.test b/mysql-test/suite/maria/maria_partition.test
index 47571c7a4be..47571c7a4be 100644
--- a/mysql-test/suite/maria/t/maria_partition.test
+++ b/mysql-test/suite/maria/maria_partition.test
diff --git a/mysql-test/suite/maria/r/maria_showlog_error.result b/mysql-test/suite/maria/maria_showlog_error.result
index e2434efec28..e2434efec28 100644
--- a/mysql-test/suite/maria/r/maria_showlog_error.result
+++ b/mysql-test/suite/maria/maria_showlog_error.result
diff --git a/mysql-test/suite/maria/t/maria_showlog_error.test b/mysql-test/suite/maria/maria_showlog_error.test
index d6c59c5a0a6..d6c59c5a0a6 100644
--- a/mysql-test/suite/maria/t/maria_showlog_error.test
+++ b/mysql-test/suite/maria/maria_showlog_error.test
diff --git a/mysql-test/suite/maria/r/max_length.result b/mysql-test/suite/maria/max_length.result
index 6db58622698..6db58622698 100644
--- a/mysql-test/suite/maria/r/max_length.result
+++ b/mysql-test/suite/maria/max_length.result
diff --git a/mysql-test/suite/maria/t/max_length.test b/mysql-test/suite/maria/max_length.test
index 68ad1e22aa9..68ad1e22aa9 100644
--- a/mysql-test/suite/maria/t/max_length.test
+++ b/mysql-test/suite/maria/max_length.test
diff --git a/mysql-test/suite/maria/r/optimize.result b/mysql-test/suite/maria/optimize.result
index 9cce55d6199..9cce55d6199 100644
--- a/mysql-test/suite/maria/r/optimize.result
+++ b/mysql-test/suite/maria/optimize.result
diff --git a/mysql-test/suite/maria/t/optimize.test b/mysql-test/suite/maria/optimize.test
index 6b310b1d1a6..6b310b1d1a6 100644
--- a/mysql-test/suite/maria/t/optimize.test
+++ b/mysql-test/suite/maria/optimize.test
diff --git a/mysql-test/suite/maria/r/ps_maria.result b/mysql-test/suite/maria/ps_maria.result
index 6c1b40302ec..6c1b40302ec 100644
--- a/mysql-test/suite/maria/r/ps_maria.result
+++ b/mysql-test/suite/maria/ps_maria.result
diff --git a/mysql-test/suite/maria/t/ps_maria.test b/mysql-test/suite/maria/ps_maria.test
index d3623314631..d3623314631 100644
--- a/mysql-test/suite/maria/t/ps_maria.test
+++ b/mysql-test/suite/maria/ps_maria.test
diff --git a/mysql-test/suite/maria/t/small_blocksize-master.opt b/mysql-test/suite/maria/small_blocksize-master.opt
index 59fd35a7846..59fd35a7846 100644
--- a/mysql-test/suite/maria/t/small_blocksize-master.opt
+++ b/mysql-test/suite/maria/small_blocksize-master.opt
diff --git a/mysql-test/suite/maria/r/small_blocksize.result b/mysql-test/suite/maria/small_blocksize.result
index f418a1f92ef..f418a1f92ef 100644
--- a/mysql-test/suite/maria/r/small_blocksize.result
+++ b/mysql-test/suite/maria/small_blocksize.result
diff --git a/mysql-test/suite/maria/t/small_blocksize.test b/mysql-test/suite/maria/small_blocksize.test
index 0acf8df6e66..0acf8df6e66 100644
--- a/mysql-test/suite/maria/t/small_blocksize.test
+++ b/mysql-test/suite/maria/small_blocksize.test