From b04c4801b0529aebb39c8d9be95c123d2f3b7d46 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 4 Apr 2012 00:16:38 +0300 Subject: [PATCH] Created suites for heap, archive and csv. Moved test from main suite to the new suites. Move tests from maria/t and maria/r to maria mysql-test/mysql-test-run.pl: Added support for the new suites --- mysql-test/mysql-test-run.pl | 3 +++ mysql-test/{r => suite/archive}/archive-big.result | 0 mysql-test/{t => suite/archive}/archive-big.test | 0 mysql-test/{r => suite/archive}/archive.result | 0 mysql-test/{t => suite/archive}/archive.test | 0 mysql-test/{r => suite/archive}/archive_bitfield.result | 0 mysql-test/{t => suite/archive}/archive_bitfield.test | 0 mysql-test/{r => suite/archive}/archive_debug.result | 0 mysql-test/{t => suite/archive}/archive_debug.test | 0 mysql-test/{r => suite/archive}/archive_gis.result | 0 mysql-test/{t => suite/archive}/archive_gis.test | 0 mysql-test/{r => suite/archive}/archive_plugin.result | 0 mysql-test/{t => suite/archive}/archive_plugin.test | 0 .../{r => suite/archive}/mysqlhotcopy_archive.result | 0 .../{t => suite/archive}/mysqlhotcopy_archive.test | 0 mysql-test/{r => suite/archive}/partition_archive.result | 0 mysql-test/{t => suite/archive}/partition_archive.test | 0 mysql-test/suite/archive/suite.pm | 9 +++++++++ mysql-test/{r => suite/csv}/csv.result | 0 mysql-test/{t => suite/csv}/csv.test | 0 mysql-test/{r => suite/csv}/csv_alter_table.result | 0 mysql-test/{t => suite/csv}/csv_alter_table.test | 0 mysql-test/{r => suite/csv}/csv_not_null.result | 0 mysql-test/{t => suite/csv}/csv_not_null.test | 0 mysql-test/{r => suite/heap}/heap.result | 0 mysql-test/{t => suite/heap}/heap.test | 0 mysql-test/{r => suite/heap}/heap_auto_increment.result | 0 mysql-test/{t => suite/heap}/heap_auto_increment.test | 0 mysql-test/{r => suite/heap}/heap_btree.result | 0 mysql-test/{t => suite/heap}/heap_btree.test | 0 mysql-test/{r => suite/heap}/heap_hash.result | 0 mysql-test/{t => suite/heap}/heap_hash.test | 0 mysql-test/suite/maria/{t => }/compat_aliases-master.opt | 0 mysql-test/suite/maria/{r => }/group_commit.result | 0 mysql-test/suite/maria/{t => }/group_commit.test | 0 mysql-test/suite/maria/{r => }/locking.result | 0 mysql-test/suite/maria/{t => }/locking.test | 0 mysql-test/suite/maria/{r => }/maria-autozerofill.result | 0 mysql-test/suite/maria/{t => }/maria-autozerofill.test | 0 mysql-test/suite/maria/{r => }/maria-big.result | 0 mysql-test/suite/maria/{t => }/maria-big.test | 0 mysql-test/suite/maria/{r => }/maria-big2.result | 0 mysql-test/suite/maria/{t => }/maria-big2.test | 0 mysql-test/suite/maria/{r => }/maria-connect.result | 0 mysql-test/suite/maria/{t => }/maria-connect.test | 0 mysql-test/suite/maria/{t => }/maria-gis-recovery.opt | 0 mysql-test/suite/maria/{r => }/maria-gis-recovery.result | 0 mysql-test/suite/maria/{t => }/maria-gis-recovery.test | 0 .../suite/maria/{r => }/maria-gis-rtree-dynamic.result | 0 .../suite/maria/{t => }/maria-gis-rtree-dynamic.test | 0 .../suite/maria/{r => }/maria-gis-rtree-trans.result | 0 .../suite/maria/{t => }/maria-gis-rtree-trans.test | 0 mysql-test/suite/maria/{r => }/maria-gis-rtree.result | 0 mysql-test/suite/maria/{t => }/maria-gis-rtree.test | 0 mysql-test/suite/maria/{r => }/maria-mvcc.result | 0 mysql-test/suite/maria/{t => }/maria-mvcc.test | 0 mysql-test/suite/maria/{r => }/maria-no-logging.result | 0 mysql-test/suite/maria/{t => }/maria-no-logging.test | 0 .../suite/maria/{r => }/maria-page-checksum.result | 0 mysql-test/suite/maria/{t => }/maria-page-checksum.test | 0 mysql-test/suite/maria/{r => }/maria-partitioning.result | 0 mysql-test/suite/maria/{t => }/maria-partitioning.test | 0 mysql-test/suite/maria/{r => }/maria-preload.result | 0 mysql-test/suite/maria/{t => }/maria-preload.test | 0 mysql-test/suite/maria/{r => }/maria-purge.result | 0 mysql-test/suite/maria/{t => }/maria-purge.test | 0 mysql-test/suite/maria/{t => }/maria-recover-master.opt | 0 mysql-test/suite/maria/{r => }/maria-recover.result | 0 mysql-test/suite/maria/{t => }/maria-recover.test | 0 .../suite/maria/{t => }/maria-recovery-big-master.opt | 0 mysql-test/suite/maria/{r => }/maria-recovery-big.result | 0 mysql-test/suite/maria/{t => }/maria-recovery-big.test | 0 .../suite/maria/{t => }/maria-recovery-bitmap-master.opt | 0 .../suite/maria/{r => }/maria-recovery-bitmap.result | 0 .../suite/maria/{t => }/maria-recovery-bitmap.test | 0 mysql-test/suite/maria/{t => }/maria-recovery-master.opt | 0 .../maria/{t => }/maria-recovery-rtree-ft-master.opt | 0 .../suite/maria/{r => }/maria-recovery-rtree-ft.result | 0 .../suite/maria/{t => }/maria-recovery-rtree-ft.test | 0 mysql-test/suite/maria/{r => }/maria-recovery.result | 0 mysql-test/suite/maria/{t => }/maria-recovery.test | 0 .../suite/maria/{t => }/maria-recovery2-master.opt | 0 mysql-test/suite/maria/{r => }/maria-recovery2.result | 0 mysql-test/suite/maria/{t => }/maria-recovery2.test | 0 .../suite/maria/{t => }/maria-recovery3-master.opt | 0 mysql-test/suite/maria/{r => }/maria-recovery3.result | 0 mysql-test/suite/maria/{t => }/maria-recovery3.test | 0 mysql-test/suite/maria/{r => }/maria-ucs2.result | 0 mysql-test/suite/maria/{t => }/maria-ucs2.test | 0 mysql-test/suite/maria/{r => }/maria.result | 0 mysql-test/suite/maria/{t => }/maria.test | 0 mysql-test/suite/maria/{r => }/maria2.result | 0 mysql-test/suite/maria/{t => }/maria2.test | 0 mysql-test/suite/maria/{r => }/maria3.result | 0 mysql-test/suite/maria/{t => }/maria3.test | 0 mysql-test/suite/maria/{r => }/maria_notembedded.result | 0 mysql-test/suite/maria/{t => }/maria_notembedded.test | 0 mysql-test/suite/maria/{r => }/maria_partition.result | 0 mysql-test/suite/maria/{t => }/maria_partition.test | 0 .../suite/maria/{r => }/maria_showlog_error.result | 0 mysql-test/suite/maria/{t => }/maria_showlog_error.test | 0 mysql-test/suite/maria/{r => }/max_length.result | 0 mysql-test/suite/maria/{t => }/max_length.test | 0 mysql-test/suite/maria/{r => }/optimize.result | 0 mysql-test/suite/maria/{t => }/optimize.test | 0 mysql-test/suite/maria/{r => }/ps_maria.result | 0 mysql-test/suite/maria/{t => }/ps_maria.test | 0 .../suite/maria/{t => }/small_blocksize-master.opt | 0 mysql-test/suite/maria/{r => }/small_blocksize.result | 0 mysql-test/suite/maria/{t => }/small_blocksize.test | 0 110 files changed, 12 insertions(+) rename mysql-test/{r => suite/archive}/archive-big.result (100%) rename mysql-test/{t => suite/archive}/archive-big.test (100%) rename mysql-test/{r => suite/archive}/archive.result (100%) rename mysql-test/{t => suite/archive}/archive.test (100%) rename mysql-test/{r => suite/archive}/archive_bitfield.result (100%) rename mysql-test/{t => suite/archive}/archive_bitfield.test (100%) rename mysql-test/{r => suite/archive}/archive_debug.result (100%) rename mysql-test/{t => suite/archive}/archive_debug.test (100%) rename mysql-test/{r => suite/archive}/archive_gis.result (100%) rename mysql-test/{t => suite/archive}/archive_gis.test (100%) rename mysql-test/{r => suite/archive}/archive_plugin.result (100%) rename mysql-test/{t => suite/archive}/archive_plugin.test (100%) rename mysql-test/{r => suite/archive}/mysqlhotcopy_archive.result (100%) rename mysql-test/{t => suite/archive}/mysqlhotcopy_archive.test (100%) rename mysql-test/{r => suite/archive}/partition_archive.result (100%) rename mysql-test/{t => suite/archive}/partition_archive.test (100%) create mode 100644 mysql-test/suite/archive/suite.pm rename mysql-test/{r => suite/csv}/csv.result (100%) rename mysql-test/{t => suite/csv}/csv.test (100%) rename mysql-test/{r => suite/csv}/csv_alter_table.result (100%) rename mysql-test/{t => suite/csv}/csv_alter_table.test (100%) rename mysql-test/{r => suite/csv}/csv_not_null.result (100%) rename mysql-test/{t => suite/csv}/csv_not_null.test (100%) rename mysql-test/{r => suite/heap}/heap.result (100%) rename mysql-test/{t => suite/heap}/heap.test (100%) rename mysql-test/{r => suite/heap}/heap_auto_increment.result (100%) rename mysql-test/{t => suite/heap}/heap_auto_increment.test (100%) rename mysql-test/{r => suite/heap}/heap_btree.result (100%) rename mysql-test/{t => suite/heap}/heap_btree.test (100%) rename mysql-test/{r => suite/heap}/heap_hash.result (100%) rename mysql-test/{t => suite/heap}/heap_hash.test (100%) rename mysql-test/suite/maria/{t => }/compat_aliases-master.opt (100%) rename mysql-test/suite/maria/{r => }/group_commit.result (100%) rename mysql-test/suite/maria/{t => }/group_commit.test (100%) rename mysql-test/suite/maria/{r => }/locking.result (100%) rename mysql-test/suite/maria/{t => }/locking.test (100%) rename mysql-test/suite/maria/{r => }/maria-autozerofill.result (100%) rename mysql-test/suite/maria/{t => }/maria-autozerofill.test (100%) rename mysql-test/suite/maria/{r => }/maria-big.result (100%) rename mysql-test/suite/maria/{t => }/maria-big.test (100%) rename mysql-test/suite/maria/{r => }/maria-big2.result (100%) rename mysql-test/suite/maria/{t => }/maria-big2.test (100%) rename mysql-test/suite/maria/{r => }/maria-connect.result (100%) rename mysql-test/suite/maria/{t => }/maria-connect.test (100%) rename mysql-test/suite/maria/{t => }/maria-gis-recovery.opt (100%) rename mysql-test/suite/maria/{r => }/maria-gis-recovery.result (100%) rename mysql-test/suite/maria/{t => }/maria-gis-recovery.test (100%) rename mysql-test/suite/maria/{r => }/maria-gis-rtree-dynamic.result (100%) rename mysql-test/suite/maria/{t => }/maria-gis-rtree-dynamic.test (100%) rename mysql-test/suite/maria/{r => }/maria-gis-rtree-trans.result (100%) rename mysql-test/suite/maria/{t => }/maria-gis-rtree-trans.test (100%) rename mysql-test/suite/maria/{r => }/maria-gis-rtree.result (100%) rename mysql-test/suite/maria/{t => }/maria-gis-rtree.test (100%) rename mysql-test/suite/maria/{r => }/maria-mvcc.result (100%) rename mysql-test/suite/maria/{t => }/maria-mvcc.test (100%) rename mysql-test/suite/maria/{r => }/maria-no-logging.result (100%) rename mysql-test/suite/maria/{t => }/maria-no-logging.test (100%) rename mysql-test/suite/maria/{r => }/maria-page-checksum.result (100%) rename mysql-test/suite/maria/{t => }/maria-page-checksum.test (100%) rename mysql-test/suite/maria/{r => }/maria-partitioning.result (100%) rename mysql-test/suite/maria/{t => }/maria-partitioning.test (100%) rename mysql-test/suite/maria/{r => }/maria-preload.result (100%) rename mysql-test/suite/maria/{t => }/maria-preload.test (100%) rename mysql-test/suite/maria/{r => }/maria-purge.result (100%) rename mysql-test/suite/maria/{t => }/maria-purge.test (100%) rename mysql-test/suite/maria/{t => }/maria-recover-master.opt (100%) rename mysql-test/suite/maria/{r => }/maria-recover.result (100%) rename mysql-test/suite/maria/{t => }/maria-recover.test (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-big-master.opt (100%) rename mysql-test/suite/maria/{r => }/maria-recovery-big.result (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-big.test (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-bitmap-master.opt (100%) rename mysql-test/suite/maria/{r => }/maria-recovery-bitmap.result (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-bitmap.test (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-master.opt (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-rtree-ft-master.opt (100%) rename mysql-test/suite/maria/{r => }/maria-recovery-rtree-ft.result (100%) rename mysql-test/suite/maria/{t => }/maria-recovery-rtree-ft.test (100%) rename mysql-test/suite/maria/{r => }/maria-recovery.result (100%) rename mysql-test/suite/maria/{t => }/maria-recovery.test (100%) rename mysql-test/suite/maria/{t => }/maria-recovery2-master.opt (100%) rename mysql-test/suite/maria/{r => }/maria-recovery2.result (100%) rename mysql-test/suite/maria/{t => }/maria-recovery2.test (100%) rename mysql-test/suite/maria/{t => }/maria-recovery3-master.opt (100%) rename mysql-test/suite/maria/{r => }/maria-recovery3.result (100%) rename mysql-test/suite/maria/{t => }/maria-recovery3.test (100%) rename mysql-test/suite/maria/{r => }/maria-ucs2.result (100%) rename mysql-test/suite/maria/{t => }/maria-ucs2.test (100%) rename mysql-test/suite/maria/{r => }/maria.result (100%) rename mysql-test/suite/maria/{t => }/maria.test (100%) rename mysql-test/suite/maria/{r => }/maria2.result (100%) rename mysql-test/suite/maria/{t => }/maria2.test (100%) rename mysql-test/suite/maria/{r => }/maria3.result (100%) rename mysql-test/suite/maria/{t => }/maria3.test (100%) rename mysql-test/suite/maria/{r => }/maria_notembedded.result (100%) rename mysql-test/suite/maria/{t => }/maria_notembedded.test (100%) rename mysql-test/suite/maria/{r => }/maria_partition.result (100%) rename mysql-test/suite/maria/{t => }/maria_partition.test (100%) rename mysql-test/suite/maria/{r => }/maria_showlog_error.result (100%) rename mysql-test/suite/maria/{t => }/maria_showlog_error.test (100%) rename mysql-test/suite/maria/{r => }/max_length.result (100%) rename mysql-test/suite/maria/{t => }/max_length.test (100%) rename mysql-test/suite/maria/{r => }/optimize.result (100%) rename mysql-test/suite/maria/{t => }/optimize.test (100%) rename mysql-test/suite/maria/{r => }/ps_maria.result (100%) rename mysql-test/suite/maria/{t => }/ps_maria.test (100%) rename mysql-test/suite/maria/{t => }/small_blocksize-master.opt (100%) rename mysql-test/suite/maria/{r => }/small_blocksize.result (100%) rename mysql-test/suite/maria/{t => }/small_blocksize.test (100%) 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 similarity index 100% rename from mysql-test/r/archive-big.result rename to mysql-test/suite/archive/archive-big.result diff --git a/mysql-test/t/archive-big.test b/mysql-test/suite/archive/archive-big.test similarity index 100% rename from mysql-test/t/archive-big.test rename to mysql-test/suite/archive/archive-big.test diff --git a/mysql-test/r/archive.result b/mysql-test/suite/archive/archive.result similarity index 100% rename from mysql-test/r/archive.result rename to mysql-test/suite/archive/archive.result diff --git a/mysql-test/t/archive.test b/mysql-test/suite/archive/archive.test similarity index 100% rename from mysql-test/t/archive.test rename to mysql-test/suite/archive/archive.test diff --git a/mysql-test/r/archive_bitfield.result b/mysql-test/suite/archive/archive_bitfield.result similarity index 100% rename from mysql-test/r/archive_bitfield.result rename to mysql-test/suite/archive/archive_bitfield.result diff --git a/mysql-test/t/archive_bitfield.test b/mysql-test/suite/archive/archive_bitfield.test similarity index 100% rename from mysql-test/t/archive_bitfield.test rename to mysql-test/suite/archive/archive_bitfield.test diff --git a/mysql-test/r/archive_debug.result b/mysql-test/suite/archive/archive_debug.result similarity index 100% rename from mysql-test/r/archive_debug.result rename to mysql-test/suite/archive/archive_debug.result diff --git a/mysql-test/t/archive_debug.test b/mysql-test/suite/archive/archive_debug.test similarity index 100% rename from mysql-test/t/archive_debug.test rename to mysql-test/suite/archive/archive_debug.test diff --git a/mysql-test/r/archive_gis.result b/mysql-test/suite/archive/archive_gis.result similarity index 100% rename from mysql-test/r/archive_gis.result rename to mysql-test/suite/archive/archive_gis.result diff --git a/mysql-test/t/archive_gis.test b/mysql-test/suite/archive/archive_gis.test similarity index 100% rename from mysql-test/t/archive_gis.test rename to mysql-test/suite/archive/archive_gis.test diff --git a/mysql-test/r/archive_plugin.result b/mysql-test/suite/archive/archive_plugin.result similarity index 100% rename from mysql-test/r/archive_plugin.result rename to mysql-test/suite/archive/archive_plugin.result diff --git a/mysql-test/t/archive_plugin.test b/mysql-test/suite/archive/archive_plugin.test similarity index 100% rename from mysql-test/t/archive_plugin.test rename to mysql-test/suite/archive/archive_plugin.test diff --git a/mysql-test/r/mysqlhotcopy_archive.result b/mysql-test/suite/archive/mysqlhotcopy_archive.result similarity index 100% rename from mysql-test/r/mysqlhotcopy_archive.result rename to mysql-test/suite/archive/mysqlhotcopy_archive.result diff --git a/mysql-test/t/mysqlhotcopy_archive.test b/mysql-test/suite/archive/mysqlhotcopy_archive.test similarity index 100% rename from mysql-test/t/mysqlhotcopy_archive.test rename to mysql-test/suite/archive/mysqlhotcopy_archive.test diff --git a/mysql-test/r/partition_archive.result b/mysql-test/suite/archive/partition_archive.result similarity index 100% rename from mysql-test/r/partition_archive.result rename to mysql-test/suite/archive/partition_archive.result diff --git a/mysql-test/t/partition_archive.test b/mysql-test/suite/archive/partition_archive.test similarity index 100% rename from mysql-test/t/partition_archive.test rename to 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 similarity index 100% rename from mysql-test/r/csv.result rename to mysql-test/suite/csv/csv.result diff --git a/mysql-test/t/csv.test b/mysql-test/suite/csv/csv.test similarity index 100% rename from mysql-test/t/csv.test rename to 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 similarity index 100% rename from mysql-test/r/csv_alter_table.result rename to 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 similarity index 100% rename from mysql-test/t/csv_alter_table.test rename to 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 similarity index 100% rename from mysql-test/r/csv_not_null.result rename to 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 similarity index 100% rename from mysql-test/t/csv_not_null.test rename to mysql-test/suite/csv/csv_not_null.test diff --git a/mysql-test/r/heap.result b/mysql-test/suite/heap/heap.result similarity index 100% rename from mysql-test/r/heap.result rename to mysql-test/suite/heap/heap.result diff --git a/mysql-test/t/heap.test b/mysql-test/suite/heap/heap.test similarity index 100% rename from mysql-test/t/heap.test rename to 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 similarity index 100% rename from mysql-test/r/heap_auto_increment.result rename to 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 similarity index 100% rename from mysql-test/t/heap_auto_increment.test rename to 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 similarity index 100% rename from mysql-test/r/heap_btree.result rename to mysql-test/suite/heap/heap_btree.result diff --git a/mysql-test/t/heap_btree.test b/mysql-test/suite/heap/heap_btree.test similarity index 100% rename from mysql-test/t/heap_btree.test rename to mysql-test/suite/heap/heap_btree.test diff --git a/mysql-test/r/heap_hash.result b/mysql-test/suite/heap/heap_hash.result similarity index 100% rename from mysql-test/r/heap_hash.result rename to mysql-test/suite/heap/heap_hash.result diff --git a/mysql-test/t/heap_hash.test b/mysql-test/suite/heap/heap_hash.test similarity index 100% rename from mysql-test/t/heap_hash.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/compat_aliases-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/group_commit.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/group_commit.test rename to mysql-test/suite/maria/group_commit.test diff --git a/mysql-test/suite/maria/r/locking.result b/mysql-test/suite/maria/locking.result similarity index 100% rename from mysql-test/suite/maria/r/locking.result rename to mysql-test/suite/maria/locking.result diff --git a/mysql-test/suite/maria/t/locking.test b/mysql-test/suite/maria/locking.test similarity index 100% rename from mysql-test/suite/maria/t/locking.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-autozerofill.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-autozerofill.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-big.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-big.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-big2.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-big2.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-connect.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-connect.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-gis-recovery.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-gis-recovery.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-gis-recovery.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-gis-rtree-trans.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-gis-rtree-trans.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-gis-rtree.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-gis-rtree.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-mvcc.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-mvcc.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-no-logging.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-no-logging.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-page-checksum.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-page-checksum.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-partitioning.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-partitioning.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-preload.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-preload.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-purge.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-purge.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recover-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recover.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recover.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-big-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recovery-big.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-big.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recovery-bitmap.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-bitmap.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recovery-rtree-ft.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery-rtree-ft.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recovery.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery2-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recovery2.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery2.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery3-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-recovery3.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-recovery3.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria-ucs2.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria-ucs2.test rename to mysql-test/suite/maria/maria-ucs2.test diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/maria.result similarity index 100% rename from mysql-test/suite/maria/r/maria.result rename to mysql-test/suite/maria/maria.result diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/maria.test similarity index 100% rename from mysql-test/suite/maria/t/maria.test rename to mysql-test/suite/maria/maria.test diff --git a/mysql-test/suite/maria/r/maria2.result b/mysql-test/suite/maria/maria2.result similarity index 100% rename from mysql-test/suite/maria/r/maria2.result rename to mysql-test/suite/maria/maria2.result diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/maria2.test similarity index 100% rename from mysql-test/suite/maria/t/maria2.test rename to mysql-test/suite/maria/maria2.test diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/maria3.result similarity index 100% rename from mysql-test/suite/maria/r/maria3.result rename to mysql-test/suite/maria/maria3.result diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/maria3.test similarity index 100% rename from mysql-test/suite/maria/t/maria3.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria_notembedded.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria_notembedded.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria_partition.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria_partition.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/maria_showlog_error.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/maria_showlog_error.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/max_length.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/max_length.test rename to mysql-test/suite/maria/max_length.test diff --git a/mysql-test/suite/maria/r/optimize.result b/mysql-test/suite/maria/optimize.result similarity index 100% rename from mysql-test/suite/maria/r/optimize.result rename to mysql-test/suite/maria/optimize.result diff --git a/mysql-test/suite/maria/t/optimize.test b/mysql-test/suite/maria/optimize.test similarity index 100% rename from mysql-test/suite/maria/t/optimize.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/ps_maria.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/ps_maria.test rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/small_blocksize-master.opt rename to 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 similarity index 100% rename from mysql-test/suite/maria/r/small_blocksize.result rename to 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 similarity index 100% rename from mysql-test/suite/maria/t/small_blocksize.test rename to mysql-test/suite/maria/small_blocksize.test