Create 'main' test directory and move 't' and 'r' there

debian/mariadb-test-data.install

 usr/share/mysql/mysql-test/collections
-usr/share/mysql/mysql-test/extra
 usr/share/mysql/mysql-test/include
 usr/share/mysql/mysql-test/plugin
-usr/share/mysql/mysql-test/r
+usr/share/mysql/mysql-test/main
 usr/share/mysql/mysql-test/std_data
 usr/share/mysql/mysql-test/suite
-usr/share/mysql/mysql-test/t
 usr/share/mysql/mysql-test/unstable-tests

debian/mariadb-test.install

@@ -27,7 +27,6 @@ usr/share/mysql/mysql-test/README
 usr/share/mysql/mysql-test/README-gcov
 usr/share/mysql/mysql-test/README.stress
 usr/share/mysql/mysql-test/dgcov.pl
-usr/share/mysql/mysql-test/disabled.def
 usr/share/mysql/mysql-test/lib
 usr/share/mysql/mysql-test/mysql-stress-test.pl
 usr/share/mysql/mysql-test/mysql-test-run.pl

mysql-test/include/big_test.inc

---require r/big_test.require
+--require include/big_test.require
 disable_query_log;
 eval select $BIG_TEST as using_big_test;
 enable_query_log;

mysql-test/include/check_var_limit.inc

@@ -3,7 +3,7 @@
 # This is useful to check that a variable from SHOW_VARIABLES is within
 # certain limits. Check query_cache_merge.test for an example of using this.
 #
--- require r/check_var_limit.require
+-- require include/check_var_limit.require
 disable_query_log;
 eval select SUBSTRING_INDEX("$LIMIT", "\\t", -1) BETWEEN $MIN_LIMIT AND $MAX_LIMIT as "limit";
 enable_query_log;

mysql-test/include/have_case_insensitive_file_system.inc

---require r/case_insensitive_file_system.require
+--require include/case_insensitive_file_system.require
 --disable_query_log
 show variables like "lower_case_file_system";
 --enable_query_log

mysql-test/include/have_case_insensitive_fs.inc

---require r/case_insensitive_fs.require
+--require include/case_insensitive_fs.require
 --disable_query_log
 show variables like 'lower_case_file_system';
 --enable_query_log

mysql-test/include/have_case_sensitive_file_system.inc

---require r/case_sensitive_file_system.require
+--require include/case_sensitive_file_system.require
 --disable_query_log
 show variables like 'lower_case_file_system';
 --enable_query_log

mysql-test/include/have_compress.inc

--- require r/have_compress.require
+-- require include/have_compress.require
 disable_query_log;
 show variables like 'have_compress';
 enable_query_log;

mysql-test/include/have_csv.inc

 disable_query_log;
---require r/true.require
+--require include/true.require
 select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'csv';
 enable_query_log;

mysql-test/include/have_geometry.inc

---require r/have_geometry.require
+--require include/have_geometry.require
 --disable_query_log
 show variables like 'have_geometry';
 --enable_query_log

mysql-test/include/have_local_infile.inc

---require r/have_local_infile.require
+--require include/have_local_infile.require
 disable_query_log;
 show variables like 'local_infile';
 enable_query_log;

mysql-test/include/have_log_bin.inc

@@ -8,7 +8,7 @@
 
 source include/not_embedded.inc;
 
--- require r/have_log_bin.require
+-- require include/have_log_bin.require
 disable_query_log;
 show variables like 'log_bin';
 enable_query_log;

mysql-test/include/have_lowercase0.inc

---require r/lowercase0.require
+--require include/lowercase0.require
 --disable_query_log
 show variables like "lower_case_table_names";
 --enable_query_log

mysql-test/include/have_lowercase1.inc

---require r/lowercase1.require
+--require include/lowercase1.require
 --disable_query_log
 show variables like 'lower_case_table_names';
 --enable_query_log

mysql-test/include/have_lowercase2.inc

---require r/lowercase2.require
+--require include/lowercase2.require
 --disable_query_log
 show variables like 'lower_case_table_names';
 --enable_query_log

mysql-test/include/have_outfile.inc

--- require r/have_outfile.require
+-- require include/have_outfile.require
 disable_query_log;
 select load_file(concat(@tmpdir,'/outfile.test'));
 --remove_file $MYSQLTEST_VARDIR/tmp/outfile.test

mysql-test/include/have_plugin_interface.inc

 --disable_query_log
---require r/true.require
+--require include/true.require
 select (PLUGIN_LIBRARY LIKE 'qa_auth_interface%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS
   WHERE PLUGIN_NAME='qa_auth_interface';
 --enable_query_log

mysql-test/include/have_plugin_server.inc

 --disable_query_log
---require r/true.require
+--require include/true.require
 select (PLUGIN_LIBRARY LIKE 'qa_auth_server%') as `TRUE` FROM INFORMATION_SCHEMA.PLUGINS
   WHERE PLUGIN_NAME='qa_auth_server';
 --enable_query_log

mysql-test/include/have_pool_of_threads.inc

--- require r/have_pool_of_threads.require
+-- require include/have_pool_of_threads.require
 disable_query_log;
 show variables like 'thread_handling';
 enable_query_log;

mysql-test/include/have_profiling.inc

---require r/have_profiling.require
+--require include/have_profiling.require
 --disable_query_log
 show variables like 'have_profiling';
 --enable_query_log

mysql-test/include/have_query_cache.inc

--- require r/have_query_cache.require
+-- require include/have_query_cache.require
 disable_query_log;
 show variables like 'have_query_cache';
 enable_query_log;

mysql-test/include/have_symlink.inc

@@ -3,7 +3,7 @@
 # symlink support, and so does not test correctly under valgrind.  See the
 # comment in mysqld.cc for the --symbolic-links option.
 
--- require r/have_symlink.require
+-- require include/have_symlink.require
 
 disable_query_log;
 show variables like 'have_symlink';

mysql-test/include/have_utf16.inc

--- require r/have_utf16.require
+-- require include/have_utf16.require
 disable_query_log;
 show collation like 'utf16_general_ci';
 enable_query_log;

mysql-test/include/have_utf32.inc

--- require r/have_utf32.require
+-- require include/have_utf32.require
 disable_query_log;
 show collation like 'utf32_general_ci';
 enable_query_log;

mysql-test/include/have_utf8mb4.inc

---require r/have_utf8mb4.require
+--require include/have_utf8mb4.require
 
 --disable_query_log
 

mysql-test/include/have_working_dns.inc

@@ -5,7 +5,7 @@
 # The actual check for working DNS is done in Perl, and the result available
 # in an environment variable.
 #
---require r/have_working_dns.require
+--require include/have_working_dns.require
 disable_query_log;
 eval SELECT LENGTH('$HAVE_BROKEN_DNS') = 0 AS 'have_working_dns';
 enable_query_log;

mysql-test/include/not_staging.inc

---require r/not_staging.require
+--require include/not_staging.require
 disable_query_log;
 eval select $STAGING_RUN as using_staging_run;
 enable_query_log;

mysql-test/include/not_valgrind.inc

---require r/not_valgrind.require
+--require include/not_valgrind.require
 --disable_query_log
 eval select $VALGRIND_TEST as using_valgrind;
 --enable_query_log

mysql-test/include/one_thread_per_connection.inc

--- require r/one_thread_per_connection.require
+-- require include/one_thread_per_connection.require
 disable_query_log;
 select @@thread_handling;
 enable_query_log;

mysql-test/lib/mtr_cases.pm

@@ -292,7 +292,7 @@ sub combinations_from_file($$)
   } else {
     return () if @::opt_combinations or not -f $filename;
     # Read combinations file in my.cnf format
-    mtr_verbose("Read combinations file");
+    mtr_verbose("Read combinations file $filename");
     my $config= My::Config->new($filename);
     foreach my $group ($config->option_groups()) {
       my $comb= { name => $group->name(), comb_opt => [] };
@@ -398,7 +398,7 @@ sub collect_suite_name($$)
       }
     }
   } else {
-    $suites{$suitename} = [ $::glob_mysql_test_dir,
+    $suites{$suitename} = [ $::glob_mysql_test_dir . "/main",
                             my_find_dir(dirname($::glob_mysql_test_dir),
                                         [ @plugin_suitedirs ],
                                         'main', NOT_REQUIRED) ];
@@ -470,7 +470,9 @@ sub process_suite {
     $suitename = $basename;
   }
 
-  my $suite = load_suite_object($suitename, $suitedir);
+  my $suite = load_suite_object($suitename, (($suitename eq "main") ?
+					     $::glob_mysql_test_dir :
+					     $suitedir));
 
   #
   # Read suite config files, unless it was done aleady
@@ -647,7 +649,7 @@ sub make_combinations($$@)
   {
     # Copy test options
     my $new_test= $test->copy();
-    
+
     # Prepend the combination options to master_opt and slave_opt
     # (on the command line combinations go *before* .opt files)
     unshift @{$new_test->{master_opt}}, @{$comb->{comb_opt}};
@@ -693,8 +695,6 @@ sub collect_one_test_case {
   my $tpath     =  shift;
   my $tname     =  shift;
   my %test_combs = map { $_ => 1 } @_;
-
-
   my $suitename =  $suite->{name};
   my $name      = "$suitename.$tname";
   my $filename  = "$tpath/${tname}.test";
@@ -1096,6 +1096,7 @@ sub get_tags_from_file($$) {
   $file_to_slave_opts{$file}= $slave_opts;
   $file_combinations{$file}= [ ::uniq(@combinations) ];
   $file_in_overlay{$file} = 1 if $in_overlay;
+
   return @{$tags};
 }