Maria tests moved to separate suite. The suite made default for execution.

mysql-test/mysql-test-run.pl:
  The maria suite made default for execution.
mysql-test/suite/maria:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-autozerofill.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-big.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-big2.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-connect.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-gis-rtree-trans.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-gis-rtree.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-mvcc.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-no-logging.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-page-checksum.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-preload.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-purge.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-recover.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-recovery-big.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-recovery-bitmap.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-recovery-rtree-ft.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-recovery.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria-recovery2.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria2.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria3.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/maria_notembedded.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/r/ps_maria.result:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-autozerofill.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-big.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-big2.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-connect.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-gis-rtree-trans.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-gis-rtree.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-mvcc.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-no-logging.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-page-checksum.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-preload.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-purge.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recover-master.opt:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recover.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-big-master.opt:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-big.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-bitmap.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-master.opt:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery-rtree-ft.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery2-master.opt:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria-recovery2.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria2.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria3.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/maria_notembedded.test:
  Maria tests moved to separate suite.
mysql-test/suite/maria/t/ps_maria.test:
  Maria tests moved to separate suite.

53 files changed, 1 insertions, 1 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e042390fe59..f0be8ead176 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -134,7 +134,7 @@ our $default_vardir;
 
 our $opt_usage;
 our $opt_suites;
-our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
+our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb,maria"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 
diff --git a/mysql-test/r/maria-autozerofill.result b/mysql-test/suite/maria/r/maria-autozerofill.result
index 0b069cd7a52..0b069cd7a52 100644
--- a/mysql-test/r/maria-autozerofill.result
+++ b/mysql-test/suite/maria/r/maria-autozerofill.result
diff --git a/mysql-test/r/maria-big.result b/mysql-test/suite/maria/r/maria-big.result
index b45816367a5..b45816367a5 100644
--- a/mysql-test/r/maria-big.result
+++ b/mysql-test/suite/maria/r/maria-big.result
diff --git a/mysql-test/r/maria-big2.result b/mysql-test/suite/maria/r/maria-big2.result
index 03b959642b4..03b959642b4 100644
--- a/mysql-test/r/maria-big2.result
+++ b/mysql-test/suite/maria/r/maria-big2.result
diff --git a/mysql-test/r/maria-connect.result b/mysql-test/suite/maria/r/maria-connect.result
index 93beb1f13c5..93beb1f13c5 100644
--- a/mysql-test/r/maria-connect.result
+++ b/mysql-test/suite/maria/r/maria-connect.result
diff --git a/mysql-test/r/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
index 189872e8e13..189872e8e13 100644
--- a/mysql-test/r/maria-gis-rtree-dynamic.result
+++ b/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
diff --git a/mysql-test/r/maria-gis-rtree-trans.result b/mysql-test/suite/maria/r/maria-gis-rtree-trans.result
index 9e43daa9623..9e43daa9623 100644
--- a/mysql-test/r/maria-gis-rtree-trans.result
+++ b/mysql-test/suite/maria/r/maria-gis-rtree-trans.result
diff --git a/mysql-test/r/maria-gis-rtree.result b/mysql-test/suite/maria/r/maria-gis-rtree.result
index 0c929fe1313..0c929fe1313 100644
--- a/mysql-test/r/maria-gis-rtree.result
+++ b/mysql-test/suite/maria/r/maria-gis-rtree.result
diff --git a/mysql-test/r/maria-mvcc.result b/mysql-test/suite/maria/r/maria-mvcc.result
index 3919dfc597e..3919dfc597e 100644
--- a/mysql-test/r/maria-mvcc.result
+++ b/mysql-test/suite/maria/r/maria-mvcc.result
diff --git a/mysql-test/r/maria-no-logging.result b/mysql-test/suite/maria/r/maria-no-logging.result
index e72842ae71b..e72842ae71b 100644
--- a/mysql-test/r/maria-no-logging.result
+++ b/mysql-test/suite/maria/r/maria-no-logging.result
diff --git a/mysql-test/r/maria-page-checksum.result b/mysql-test/suite/maria/r/maria-page-checksum.result
index 0319bd9e9ca..0319bd9e9ca 100644
--- a/mysql-test/r/maria-page-checksum.result
+++ b/mysql-test/suite/maria/r/maria-page-checksum.result
diff --git a/mysql-test/r/maria-preload.result b/mysql-test/suite/maria/r/maria-preload.result
index 7c41096217a..7c41096217a 100644
--- a/mysql-test/r/maria-preload.result
+++ b/mysql-test/suite/maria/r/maria-preload.result
diff --git a/mysql-test/r/maria-purge.result b/mysql-test/suite/maria/r/maria-purge.result
index 14cf51948a8..14cf51948a8 100644
--- a/mysql-test/r/maria-purge.result
+++ b/mysql-test/suite/maria/r/maria-purge.result
diff --git a/mysql-test/r/maria-recover.result b/mysql-test/suite/maria/r/maria-recover.result
index ecb6aa8bf5f..ecb6aa8bf5f 100644
--- a/mysql-test/r/maria-recover.result
+++ b/mysql-test/suite/maria/r/maria-recover.result
diff --git a/mysql-test/r/maria-recovery-big.result b/mysql-test/suite/maria/r/maria-recovery-big.result
index ecbcba9ff82..ecbcba9ff82 100644
--- a/mysql-test/r/maria-recovery-big.result
+++ b/mysql-test/suite/maria/r/maria-recovery-big.result
diff --git a/mysql-test/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/r/maria-recovery-bitmap.result
index 01255c2394f..01255c2394f 100644
--- a/mysql-test/r/maria-recovery-bitmap.result
+++ b/mysql-test/suite/maria/r/maria-recovery-bitmap.result
diff --git a/mysql-test/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
index 474d63d5c93..474d63d5c93 100644
--- a/mysql-test/r/maria-recovery-rtree-ft.result
+++ b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
diff --git a/mysql-test/r/maria-recovery.result b/mysql-test/suite/maria/r/maria-recovery.result
index b0440489cd1..b0440489cd1 100644
--- a/mysql-test/r/maria-recovery.result
+++ b/mysql-test/suite/maria/r/maria-recovery.result
diff --git a/mysql-test/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result
index 223b5578921..223b5578921 100644
--- a/mysql-test/r/maria-recovery2.result
+++ b/mysql-test/suite/maria/r/maria-recovery2.result
diff --git a/mysql-test/r/maria.result b/mysql-test/suite/maria/r/maria.result
index 2cfc21a5778..2cfc21a5778 100644
--- a/mysql-test/r/maria.result
+++ b/mysql-test/suite/maria/r/maria.result
diff --git a/mysql-test/r/maria2.result b/mysql-test/suite/maria/r/maria2.result
index eae5d7cf422..eae5d7cf422 100644
--- a/mysql-test/r/maria2.result
+++ b/mysql-test/suite/maria/r/maria2.result
diff --git a/mysql-test/r/maria3.result b/mysql-test/suite/maria/r/maria3.result
index f7f6d969687..f7f6d969687 100644
--- a/mysql-test/r/maria3.result
+++ b/mysql-test/suite/maria/r/maria3.result
diff --git a/mysql-test/r/maria_notembedded.result b/mysql-test/suite/maria/r/maria_notembedded.result
index 36124e6351c..36124e6351c 100644
--- a/mysql-test/r/maria_notembedded.result
+++ b/mysql-test/suite/maria/r/maria_notembedded.result
diff --git a/mysql-test/r/ps_maria.result b/mysql-test/suite/maria/r/ps_maria.result
index 24dd9734e40..24dd9734e40 100644
--- a/mysql-test/r/ps_maria.result
+++ b/mysql-test/suite/maria/r/ps_maria.result
diff --git a/mysql-test/t/maria-autozerofill.test b/mysql-test/suite/maria/t/maria-autozerofill.test
index b3801679755..b3801679755 100644
--- a/mysql-test/t/maria-autozerofill.test
+++ b/mysql-test/suite/maria/t/maria-autozerofill.test
diff --git a/mysql-test/t/maria-big.test b/mysql-test/suite/maria/t/maria-big.test
index aac26ec2e60..aac26ec2e60 100644
--- a/mysql-test/t/maria-big.test
+++ b/mysql-test/suite/maria/t/maria-big.test
diff --git a/mysql-test/t/maria-big2.test b/mysql-test/suite/maria/t/maria-big2.test
index a06b6ea843b..a06b6ea843b 100644
--- a/mysql-test/t/maria-big2.test
+++ b/mysql-test/suite/maria/t/maria-big2.test
diff --git a/mysql-test/t/maria-connect.test b/mysql-test/suite/maria/t/maria-connect.test
index 35a1518ca5a..35a1518ca5a 100644
--- a/mysql-test/t/maria-connect.test
+++ b/mysql-test/suite/maria/t/maria-connect.test
diff --git a/mysql-test/t/maria-gis-rtree-dynamic.test b/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
index 228998c01c3..228998c01c3 100644
--- a/mysql-test/t/maria-gis-rtree-dynamic.test
+++ b/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
diff --git a/mysql-test/t/maria-gis-rtree-trans.test b/mysql-test/suite/maria/t/maria-gis-rtree-trans.test
index f530699c755..f530699c755 100644
--- a/mysql-test/t/maria-gis-rtree-trans.test
+++ b/mysql-test/suite/maria/t/maria-gis-rtree-trans.test
diff --git a/mysql-test/t/maria-gis-rtree.test b/mysql-test/suite/maria/t/maria-gis-rtree.test
index 7a3e5634388..7a3e5634388 100644
--- a/mysql-test/t/maria-gis-rtree.test
+++ b/mysql-test/suite/maria/t/maria-gis-rtree.test
diff --git a/mysql-test/t/maria-mvcc.test b/mysql-test/suite/maria/t/maria-mvcc.test
index 4b6f8a3996d..4b6f8a3996d 100644
--- a/mysql-test/t/maria-mvcc.test
+++ b/mysql-test/suite/maria/t/maria-mvcc.test
diff --git a/mysql-test/t/maria-no-logging.test b/mysql-test/suite/maria/t/maria-no-logging.test
index bca99848250..bca99848250 100644
--- a/mysql-test/t/maria-no-logging.test
+++ b/mysql-test/suite/maria/t/maria-no-logging.test
diff --git a/mysql-test/t/maria-page-checksum.test b/mysql-test/suite/maria/t/maria-page-checksum.test
index e0a0a1517b1..e0a0a1517b1 100644
--- a/mysql-test/t/maria-page-checksum.test
+++ b/mysql-test/suite/maria/t/maria-page-checksum.test
diff --git a/mysql-test/t/maria-preload.test b/mysql-test/suite/maria/t/maria-preload.test
index 49829a686e3..49829a686e3 100644
--- a/mysql-test/t/maria-preload.test
+++ b/mysql-test/suite/maria/t/maria-preload.test
diff --git a/mysql-test/t/maria-purge.test b/mysql-test/suite/maria/t/maria-purge.test
index 1e588807895..1e588807895 100644
--- a/mysql-test/t/maria-purge.test
+++ b/mysql-test/suite/maria/t/maria-purge.test
diff --git a/mysql-test/t/maria-recover-master.opt b/mysql-test/suite/maria/t/maria-recover-master.opt
index 0cdefeadf3d..0cdefeadf3d 100644
--- a/mysql-test/t/maria-recover-master.opt
+++ b/mysql-test/suite/maria/t/maria-recover-master.opt
diff --git a/mysql-test/t/maria-recover.test b/mysql-test/suite/maria/t/maria-recover.test
index 63e764a3b0e..63e764a3b0e 100644
--- a/mysql-test/t/maria-recover.test
+++ b/mysql-test/suite/maria/t/maria-recover.test
diff --git a/mysql-test/t/maria-recovery-big-master.opt b/mysql-test/suite/maria/t/maria-recovery-big-master.opt
index 425fda95086..425fda95086 100644
--- a/mysql-test/t/maria-recovery-big-master.opt
+++ b/mysql-test/suite/maria/t/maria-recovery-big-master.opt
diff --git a/mysql-test/t/maria-recovery-big.test b/mysql-test/suite/maria/t/maria-recovery-big.test
index 9a5eeec56c5..9a5eeec56c5 100644
--- a/mysql-test/t/maria-recovery-big.test
+++ b/mysql-test/suite/maria/t/maria-recovery-big.test
diff --git a/mysql-test/t/maria-recovery-bitmap-master.opt b/mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
index 425fda95086..425fda95086 100644
--- a/mysql-test/t/maria-recovery-bitmap-master.opt
+++ b/mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
diff --git a/mysql-test/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/t/maria-recovery-bitmap.test
index 286d44b4ff8..286d44b4ff8 100644
--- a/mysql-test/t/maria-recovery-bitmap.test
+++ b/mysql-test/suite/maria/t/maria-recovery-bitmap.test
diff --git a/mysql-test/t/maria-recovery-master.opt b/mysql-test/suite/maria/t/maria-recovery-master.opt
index 9023fb74e8b..9023fb74e8b 100644
--- a/mysql-test/t/maria-recovery-master.opt
+++ b/mysql-test/suite/maria/t/maria-recovery-master.opt
diff --git a/mysql-test/t/maria-recovery-rtree-ft-master.opt b/mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
index 425fda95086..425fda95086 100644
--- a/mysql-test/t/maria-recovery-rtree-ft-master.opt
+++ b/mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
diff --git a/mysql-test/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
index 5416c2e4edf..5416c2e4edf 100644
--- a/mysql-test/t/maria-recovery-rtree-ft.test
+++ b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
diff --git a/mysql-test/t/maria-recovery.test b/mysql-test/suite/maria/t/maria-recovery.test
index c3c9306f4d5..c3c9306f4d5 100644
--- a/mysql-test/t/maria-recovery.test
+++ b/mysql-test/suite/maria/t/maria-recovery.test
diff --git a/mysql-test/t/maria-recovery2-master.opt b/mysql-test/suite/maria/t/maria-recovery2-master.opt
index 7fece2f8c1b..7fece2f8c1b 100644
--- a/mysql-test/t/maria-recovery2-master.opt
+++ b/mysql-test/suite/maria/t/maria-recovery2-master.opt
diff --git a/mysql-test/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test
index 8ce601625f6..8ce601625f6 100644
--- a/mysql-test/t/maria-recovery2.test
+++ b/mysql-test/suite/maria/t/maria-recovery2.test
diff --git a/mysql-test/t/maria.test b/mysql-test/suite/maria/t/maria.test
index c21dfd43bd3..c21dfd43bd3 100644
--- a/mysql-test/t/maria.test
+++ b/mysql-test/suite/maria/t/maria.test
diff --git a/mysql-test/t/maria2.test b/mysql-test/suite/maria/t/maria2.test
index 682e03890a4..682e03890a4 100644
--- a/mysql-test/t/maria2.test
+++ b/mysql-test/suite/maria/t/maria2.test
diff --git a/mysql-test/t/maria3.test b/mysql-test/suite/maria/t/maria3.test
index 25b22ca5424..25b22ca5424 100644
--- a/mysql-test/t/maria3.test
+++ b/mysql-test/suite/maria/t/maria3.test
diff --git a/mysql-test/t/maria_notembedded.test b/mysql-test/suite/maria/t/maria_notembedded.test
index 0ee6a69c487..0ee6a69c487 100644
--- a/mysql-test/t/maria_notembedded.test
+++ b/mysql-test/suite/maria/t/maria_notembedded.test
diff --git a/mysql-test/t/ps_maria.test b/mysql-test/suite/maria/t/ps_maria.test
index d5a756c261e..d5a756c261e 100644
--- a/mysql-test/t/ps_maria.test
+++ b/mysql-test/suite/maria/t/ps_maria.test