2112 files changed, 74 insertions, 73 deletions

diff --git a/mysql-test/include/big_test.inc b/mysql-test/include/big_test.inc
index 6b149540c96..6bc6776d3bb 100644
--- a/mysql-test/include/big_test.inc
+++ b/mysql-test/include/big_test.inc
@@ -1,4 +1,4 @@
---require r/big_test.require
+--require include/big_test.require
 disable_query_log;
 eval select $BIG_TEST as using_big_test;
 enable_query_log;
diff --git a/mysql-test/r/big_test.require b/mysql-test/include/big_test.require
index 001b903496b..001b903496b 100644
--- a/mysql-test/r/big_test.require
+++ b/mysql-test/include/big_test.require
diff --git a/mysql-test/r/case_insensitive_file_system.require b/mysql-test/include/case_insensitive_file_system.require
index 062ac610ddd..062ac610ddd 100644
--- a/mysql-test/r/case_insensitive_file_system.require
+++ b/mysql-test/include/case_insensitive_file_system.require
diff --git a/mysql-test/r/case_insensitive_fs.require b/mysql-test/include/case_insensitive_fs.require
index 062ac610ddd..062ac610ddd 100644
--- a/mysql-test/r/case_insensitive_fs.require
+++ b/mysql-test/include/case_insensitive_fs.require
diff --git a/mysql-test/r/case_sensitive_file_system.require b/mysql-test/include/case_sensitive_file_system.require
index d0bdc6bf4ce..d0bdc6bf4ce 100644
--- a/mysql-test/r/case_sensitive_file_system.require
+++ b/mysql-test/include/case_sensitive_file_system.require
diff --git a/mysql-test/include/check_var_limit.inc b/mysql-test/include/check_var_limit.inc
index f955aeb345e..7fd886c6aba 100644
--- a/mysql-test/include/check_var_limit.inc
+++ b/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;
diff --git a/mysql-test/r/check_var_limit.require b/mysql-test/include/check_var_limit.require
index 01a59782180..01a59782180 100644
--- a/mysql-test/r/check_var_limit.require
+++ b/mysql-test/include/check_var_limit.require
diff --git a/mysql-test/include/have_case_insensitive_file_system.inc b/mysql-test/include/have_case_insensitive_file_system.inc
index 78bb7c229ca..1d731ffdb01 100644
--- a/mysql-test/include/have_case_insensitive_file_system.inc
+++ b/mysql-test/include/have_case_insensitive_file_system.inc
@@ -1,4 +1,4 @@
---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
diff --git a/mysql-test/include/have_case_insensitive_fs.inc b/mysql-test/include/have_case_insensitive_fs.inc
index de4ad73d780..16474842700 100644
--- a/mysql-test/include/have_case_insensitive_fs.inc
+++ b/mysql-test/include/have_case_insensitive_fs.inc
@@ -1,4 +1,4 @@
---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
diff --git a/mysql-test/include/have_case_sensitive_file_system.inc b/mysql-test/include/have_case_sensitive_file_system.inc
index 7bb1bef93fd..c4df83d333c 100644
--- a/mysql-test/include/have_case_sensitive_file_system.inc
+++ b/mysql-test/include/have_case_sensitive_file_system.inc
@@ -1,4 +1,4 @@
---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
diff --git a/mysql-test/include/have_compress.inc b/mysql-test/include/have_compress.inc
index 150c7f3448d..d99c1021a1f 100644
--- a/mysql-test/include/have_compress.inc
+++ b/mysql-test/include/have_compress.inc
@@ -1,4 +1,4 @@
--- require r/have_compress.require
+-- require include/have_compress.require
 disable_query_log;
 show variables like 'have_compress';
 enable_query_log;
diff --git a/mysql-test/r/have_compress.require b/mysql-test/include/have_compress.require
index 8bda2190fbe..8bda2190fbe 100644
--- a/mysql-test/r/have_compress.require
+++ b/mysql-test/include/have_compress.require
diff --git a/mysql-test/include/have_csv.inc b/mysql-test/include/have_csv.inc
index 410caa95285..4b43d41f22f 100644
--- a/mysql-test/include/have_csv.inc
+++ b/mysql-test/include/have_csv.inc
@@ -1,4 +1,4 @@
 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;
diff --git a/mysql-test/include/have_geometry.inc b/mysql-test/include/have_geometry.inc
index f1836469017..ff07eaf395b 100644
--- a/mysql-test/include/have_geometry.inc
+++ b/mysql-test/include/have_geometry.inc
@@ -1,4 +1,4 @@
---require r/have_geometry.require
+--require include/have_geometry.require
 --disable_query_log
 show variables like 'have_geometry';
 --enable_query_log
diff --git a/mysql-test/r/have_geometry.require b/mysql-test/include/have_geometry.require
index ba515a4bbb6..ba515a4bbb6 100644
--- a/mysql-test/r/have_geometry.require
+++ b/mysql-test/include/have_geometry.require
diff --git a/mysql-test/include/have_local_infile.inc b/mysql-test/include/have_local_infile.inc
index 4a1362c6e30..e42343e628b 100644
--- a/mysql-test/include/have_local_infile.inc
+++ b/mysql-test/include/have_local_infile.inc
@@ -1,4 +1,4 @@
---require r/have_local_infile.require
+--require include/have_local_infile.require
 disable_query_log;
 show variables like 'local_infile';
 enable_query_log;
diff --git a/mysql-test/r/have_local_infile.require b/mysql-test/include/have_local_infile.require
index 124540f7b77..124540f7b77 100644
--- a/mysql-test/r/have_local_infile.require
+++ b/mysql-test/include/have_local_infile.require
diff --git a/mysql-test/include/have_log_bin.inc b/mysql-test/include/have_log_bin.inc
index e51205d25ad..eb2529dae3b 100644
--- a/mysql-test/include/have_log_bin.inc
+++ b/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;
diff --git a/mysql-test/r/have_log_bin.require b/mysql-test/include/have_log_bin.require
index d4fd77e4f8d..d4fd77e4f8d 100644
--- a/mysql-test/r/have_log_bin.require
+++ b/mysql-test/include/have_log_bin.require
diff --git a/mysql-test/include/have_lowercase0.inc b/mysql-test/include/have_lowercase0.inc
index 9cd21a42f6a..850e3a4cd39 100644
--- a/mysql-test/include/have_lowercase0.inc
+++ b/mysql-test/include/have_lowercase0.inc
@@ -1,4 +1,4 @@
---require r/lowercase0.require
+--require include/lowercase0.require
 --disable_query_log
 show variables like "lower_case_table_names";
 --enable_query_log
diff --git a/mysql-test/include/have_lowercase1.inc b/mysql-test/include/have_lowercase1.inc
index 1b33432dbe3..5be06cf4d6b 100644
--- a/mysql-test/include/have_lowercase1.inc
+++ b/mysql-test/include/have_lowercase1.inc
@@ -1,4 +1,4 @@
---require r/lowercase1.require
+--require include/lowercase1.require
 --disable_query_log
 show variables like 'lower_case_table_names';
 --enable_query_log
diff --git a/mysql-test/include/have_lowercase2.inc b/mysql-test/include/have_lowercase2.inc
index 43b34653f54..1816cd89611 100644
--- a/mysql-test/include/have_lowercase2.inc
+++ b/mysql-test/include/have_lowercase2.inc
@@ -1,4 +1,4 @@
---require r/lowercase2.require
+--require include/lowercase2.require
 --disable_query_log
 show variables like 'lower_case_table_names';
 --enable_query_log
diff --git a/mysql-test/r/have_met_timezone.require b/mysql-test/include/have_met_timezone.require
index b3fde075ebd..b3fde075ebd 100644
--- a/mysql-test/r/have_met_timezone.require
+++ b/mysql-test/include/have_met_timezone.require
diff --git a/mysql-test/r/have_moscow_leap_timezone.require b/mysql-test/include/have_moscow_leap_timezone.require
index f27452d7770..f27452d7770 100644
--- a/mysql-test/r/have_moscow_leap_timezone.require
+++ b/mysql-test/include/have_moscow_leap_timezone.require
diff --git a/mysql-test/include/have_outfile.inc b/mysql-test/include/have_outfile.inc
index d1d4e1a0fee..705d394b206 100644
--- a/mysql-test/include/have_outfile.inc
+++ b/mysql-test/include/have_outfile.inc
@@ -1,4 +1,4 @@
--- 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
diff --git a/mysql-test/r/have_outfile.require b/mysql-test/include/have_outfile.require
index 71137a69a91..71137a69a91 100644
--- a/mysql-test/r/have_outfile.require
+++ b/mysql-test/include/have_outfile.require
diff --git a/mysql-test/r/have_perror.require b/mysql-test/include/have_perror.require
index 260687c87f0..260687c87f0 100644
--- a/mysql-test/r/have_perror.require
+++ b/mysql-test/include/have_perror.require
diff --git a/mysql-test/include/have_plugin_interface.inc b/mysql-test/include/have_plugin_interface.inc
index afe8ffad40d..203fb807204 100644
--- a/mysql-test/include/have_plugin_interface.inc
+++ b/mysql-test/include/have_plugin_interface.inc
@@ -1,5 +1,5 @@
 --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
diff --git a/mysql-test/include/have_plugin_server.inc b/mysql-test/include/have_plugin_server.inc
index aad1f026b44..8d85bec8114 100644
--- a/mysql-test/include/have_plugin_server.inc
+++ b/mysql-test/include/have_plugin_server.inc
@@ -1,5 +1,5 @@
 --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
diff --git a/mysql-test/include/have_pool_of_threads.inc b/mysql-test/include/have_pool_of_threads.inc
index ab93a62d568..432c6216804 100644
--- a/mysql-test/include/have_pool_of_threads.inc
+++ b/mysql-test/include/have_pool_of_threads.inc
@@ -1,4 +1,4 @@
--- 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;
diff --git a/mysql-test/r/have_pool_of_threads.require b/mysql-test/include/have_pool_of_threads.require
index 04e46a71903..04e46a71903 100644
--- a/mysql-test/r/have_pool_of_threads.require
+++ b/mysql-test/include/have_pool_of_threads.require
diff --git a/mysql-test/include/have_profiling.inc b/mysql-test/include/have_profiling.inc
index 48f6668ff92..4048555debc 100644
--- a/mysql-test/include/have_profiling.inc
+++ b/mysql-test/include/have_profiling.inc
@@ -1,4 +1,4 @@
---require r/have_profiling.require
+--require include/have_profiling.require
 --disable_query_log
 show variables like 'have_profiling';
 --enable_query_log
diff --git a/mysql-test/r/have_profiling.require b/mysql-test/include/have_profiling.require
index 54caeba1dae..54caeba1dae 100644
--- a/mysql-test/r/have_profiling.require
+++ b/mysql-test/include/have_profiling.require
diff --git a/mysql-test/include/have_query_cache.inc b/mysql-test/include/have_query_cache.inc
index 09602fd2dd5..d90669737bd 100644
--- a/mysql-test/include/have_query_cache.inc
+++ b/mysql-test/include/have_query_cache.inc
@@ -1,4 +1,4 @@
--- require r/have_query_cache.require
+-- require include/have_query_cache.require
 disable_query_log;
 show variables like 'have_query_cache';
 enable_query_log;
diff --git a/mysql-test/r/have_query_cache.require b/mysql-test/include/have_query_cache.require
index 312d837fed3..312d837fed3 100644
--- a/mysql-test/r/have_query_cache.require
+++ b/mysql-test/include/have_query_cache.require
diff --git a/mysql-test/include/have_symlink.inc b/mysql-test/include/have_symlink.inc
index ec4743531fd..945fc96f25f 100644
--- a/mysql-test/include/have_symlink.inc
+++ b/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';
diff --git a/mysql-test/r/have_symlink.require b/mysql-test/include/have_symlink.require
index 55ad9437034..55ad9437034 100644
--- a/mysql-test/r/have_symlink.require
+++ b/mysql-test/include/have_symlink.require
diff --git a/mysql-test/include/have_utf16.inc b/mysql-test/include/have_utf16.inc
index ab22c255c88..0dfe8e9ced4 100644
--- a/mysql-test/include/have_utf16.inc
+++ b/mysql-test/include/have_utf16.inc
@@ -1,4 +1,4 @@
--- require r/have_utf16.require
+-- require include/have_utf16.require
 disable_query_log;
 show collation like 'utf16_general_ci';
 enable_query_log;
diff --git a/mysql-test/r/have_utf16.require b/mysql-test/include/have_utf16.require
index a1b5469cad7..a1b5469cad7 100644
--- a/mysql-test/r/have_utf16.require
+++ b/mysql-test/include/have_utf16.require
diff --git a/mysql-test/include/have_utf32.inc b/mysql-test/include/have_utf32.inc
index f5b5353c9fd..7d3b2b6938a 100644
--- a/mysql-test/include/have_utf32.inc
+++ b/mysql-test/include/have_utf32.inc
@@ -1,4 +1,4 @@
--- require r/have_utf32.require
+-- require include/have_utf32.require
 disable_query_log;
 show collation like 'utf32_general_ci';
 enable_query_log;
diff --git a/mysql-test/r/have_utf32.require b/mysql-test/include/have_utf32.require
index 710ddb8090c..710ddb8090c 100644
--- a/mysql-test/r/have_utf32.require
+++ b/mysql-test/include/have_utf32.require
diff --git a/mysql-test/include/have_utf8mb4.inc b/mysql-test/include/have_utf8mb4.inc
index 6eb91b1c23c..42e7d32a26c 100644
--- a/mysql-test/include/have_utf8mb4.inc
+++ b/mysql-test/include/have_utf8mb4.inc
@@ -1,4 +1,4 @@
---require r/have_utf8mb4.require
+--require include/have_utf8mb4.require
 
 --disable_query_log
 
diff --git a/mysql-test/r/have_utf8mb4.require b/mysql-test/include/have_utf8mb4.require
index 1669b332d0d..1669b332d0d 100644
--- a/mysql-test/r/have_utf8mb4.require
+++ b/mysql-test/include/have_utf8mb4.require
diff --git a/mysql-test/include/have_working_dns.inc b/mysql-test/include/have_working_dns.inc
index 8fed5cd3df5..6118d48946f 100644
--- a/mysql-test/include/have_working_dns.inc
+++ b/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;
diff --git a/mysql-test/r/have_working_dns.require b/mysql-test/include/have_working_dns.require
index 67b5a22ce19..67b5a22ce19 100644
--- a/mysql-test/r/have_working_dns.require
+++ b/mysql-test/include/have_working_dns.require
diff --git a/mysql-test/r/lowercase0.require b/mysql-test/include/lowercase0.require
index 5550a2e93b8..5550a2e93b8 100644
--- a/mysql-test/r/lowercase0.require
+++ b/mysql-test/include/lowercase0.require
diff --git a/mysql-test/r/lowercase1.require b/mysql-test/include/lowercase1.require
index 0341f838f7b..0341f838f7b 100644
--- a/mysql-test/r/lowercase1.require
+++ b/mysql-test/include/lowercase1.require
diff --git a/mysql-test/r/lowercase2.require b/mysql-test/include/lowercase2.require
index 522eac63e81..522eac63e81 100644
--- a/mysql-test/r/lowercase2.require
+++ b/mysql-test/include/lowercase2.require
diff --git a/mysql-test/include/not_staging.inc b/mysql-test/include/not_staging.inc
index bd3813ead2f..bf93c2cbb87 100644
--- a/mysql-test/include/not_staging.inc
+++ b/mysql-test/include/not_staging.inc
@@ -1,4 +1,4 @@
---require r/not_staging.require
+--require include/not_staging.require
 disable_query_log;
 eval select $STAGING_RUN as using_staging_run;
 enable_query_log;
diff --git a/mysql-test/r/not_staging.require b/mysql-test/include/not_staging.require
index 3073f02c045..3073f02c045 100644
--- a/mysql-test/r/not_staging.require
+++ b/mysql-test/include/not_staging.require
diff --git a/mysql-test/r/not_true.require b/mysql-test/include/not_true.require
index 0032832f3d1..0032832f3d1 100644
--- a/mysql-test/r/not_true.require
+++ b/mysql-test/include/not_true.require
diff --git a/mysql-test/include/not_valgrind.inc b/mysql-test/include/not_valgrind.inc
index bdddaf534ca..8bda3497878 100644
--- a/mysql-test/include/not_valgrind.inc
+++ b/mysql-test/include/not_valgrind.inc
@@ -1,4 +1,4 @@
---require r/not_valgrind.require
+--require include/not_valgrind.require
 --disable_query_log
 eval select $VALGRIND_TEST as using_valgrind;
 --enable_query_log
diff --git a/mysql-test/r/not_valgrind.require b/mysql-test/include/not_valgrind.require
index 5d779c6bfcb..5d779c6bfcb 100644
--- a/mysql-test/r/not_valgrind.require
+++ b/mysql-test/include/not_valgrind.require
diff --git a/mysql-test/include/one_thread_per_connection.inc b/mysql-test/include/one_thread_per_connection.inc
index 4b38800733b..08b47fbf435 100644
--- a/mysql-test/include/one_thread_per_connection.inc
+++ b/mysql-test/include/one_thread_per_connection.inc
@@ -1,4 +1,4 @@
--- require r/one_thread_per_connection.require
+-- require include/one_thread_per_connection.require
 disable_query_log;
 select @@thread_handling;
 enable_query_log;
diff --git a/mysql-test/r/one_thread_per_connection.require b/mysql-test/include/one_thread_per_connection.require
index b2efbca6441..b2efbca6441 100644
--- a/mysql-test/r/one_thread_per_connection.require
+++ b/mysql-test/include/one_thread_per_connection.require
diff --git a/mysql-test/r/true.require b/mysql-test/include/true.require
index 09aae1ed1d0..09aae1ed1d0 100644
--- a/mysql-test/r/true.require
+++ b/mysql-test/include/true.require
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index d758b81c1c7..61ce88f9a5a 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/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};
 }
 
diff --git a/mysql-test/r/1st.result b/mysql-test/main/1st.result
index cb2da3505f5..cb2da3505f5 100644
--- a/mysql-test/r/1st.result
+++ b/mysql-test/main/1st.result
diff --git a/mysql-test/t/1st.test b/mysql-test/main/1st.test
index 6b93efee944..6b93efee944 100644
--- a/mysql-test/t/1st.test
+++ b/mysql-test/main/1st.test
diff --git a/mysql-test/r/aborted_clients.result b/mysql-test/main/aborted_clients.result
index 8eb6df59653..8eb6df59653 100644
--- a/mysql-test/r/aborted_clients.result
+++ b/mysql-test/main/aborted_clients.result
diff --git a/mysql-test/t/aborted_clients.test b/mysql-test/main/aborted_clients.test
index 20ddc9991e6..20ddc9991e6 100644
--- a/mysql-test/t/aborted_clients.test
+++ b/mysql-test/main/aborted_clients.test
diff --git a/mysql-test/r/adddate_454.result b/mysql-test/main/adddate_454.result
index 851292121f2..851292121f2 100644
--- a/mysql-test/r/adddate_454.result
+++ b/mysql-test/main/adddate_454.result
diff --git a/mysql-test/t/adddate_454.test b/mysql-test/main/adddate_454.test
index bbdd89b583d..bbdd89b583d 100644
--- a/mysql-test/t/adddate_454.test
+++ b/mysql-test/main/adddate_454.test
diff --git a/mysql-test/r/alias.result b/mysql-test/main/alias.result
index defd44f2548..defd44f2548 100644
--- a/mysql-test/r/alias.result
+++ b/mysql-test/main/alias.result
diff --git a/mysql-test/t/alias.test b/mysql-test/main/alias.test
index c02ebe2f5ff..c02ebe2f5ff 100644
--- a/mysql-test/t/alias.test
+++ b/mysql-test/main/alias.test
diff --git a/mysql-test/r/almost_full.result b/mysql-test/main/almost_full.result
index b2d7092aa51..b2d7092aa51 100644
--- a/mysql-test/r/almost_full.result
+++ b/mysql-test/main/almost_full.result
diff --git a/mysql-test/t/almost_full.test b/mysql-test/main/almost_full.test
index 2517008fdf8..2517008fdf8 100644
--- a/mysql-test/t/almost_full.test
+++ b/mysql-test/main/almost_full.test
diff --git a/mysql-test/r/alter_table-big.result b/mysql-test/main/alter_table-big.result
index 32689daa3a6..32689daa3a6 100644
--- a/mysql-test/r/alter_table-big.result
+++ b/mysql-test/main/alter_table-big.result
diff --git a/mysql-test/t/alter_table-big.test b/mysql-test/main/alter_table-big.test
index b010815955f..b010815955f 100644
--- a/mysql-test/t/alter_table-big.test
+++ b/mysql-test/main/alter_table-big.test
diff --git a/mysql-test/r/alter_table.result b/mysql-test/main/alter_table.result
index 9b394926489..9b394926489 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/main/alter_table.result
diff --git a/mysql-test/t/alter_table.test b/mysql-test/main/alter_table.test
index 7f692f36f4e..7f692f36f4e 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/main/alter_table.test
diff --git a/mysql-test/r/alter_table_autoinc-5574.result b/mysql-test/main/alter_table_autoinc-5574.result
index 9476313c773..9476313c773 100644
--- a/mysql-test/r/alter_table_autoinc-5574.result
+++ b/mysql-test/main/alter_table_autoinc-5574.result
diff --git a/mysql-test/t/alter_table_autoinc-5574.test b/mysql-test/main/alter_table_autoinc-5574.test
index 95c2b8d81bb..95c2b8d81bb 100644
--- a/mysql-test/t/alter_table_autoinc-5574.test
+++ b/mysql-test/main/alter_table_autoinc-5574.test
diff --git a/mysql-test/r/alter_table_mdev539_maria.result b/mysql-test/main/alter_table_mdev539_maria.result
index 0206f4070a0..0206f4070a0 100644
--- a/mysql-test/r/alter_table_mdev539_maria.result
+++ b/mysql-test/main/alter_table_mdev539_maria.result
diff --git a/mysql-test/t/alter_table_mdev539_maria.test b/mysql-test/main/alter_table_mdev539_maria.test
index 7e01bc3be84..7e01bc3be84 100644
--- a/mysql-test/t/alter_table_mdev539_maria.test
+++ b/mysql-test/main/alter_table_mdev539_maria.test
diff --git a/mysql-test/r/alter_table_mdev539_myisam.result b/mysql-test/main/alter_table_mdev539_myisam.result
index 0339a64c9c7..0339a64c9c7 100644
--- a/mysql-test/r/alter_table_mdev539_myisam.result
+++ b/mysql-test/main/alter_table_mdev539_myisam.result
diff --git a/mysql-test/t/alter_table_mdev539_myisam.test b/mysql-test/main/alter_table_mdev539_myisam.test
index 0a5669088bf..0a5669088bf 100644
--- a/mysql-test/t/alter_table_mdev539_myisam.test
+++ b/mysql-test/main/alter_table_mdev539_myisam.test
diff --git a/mysql-test/r/alter_table_online.result b/mysql-test/main/alter_table_online.result
index d5a2a028acc..d5a2a028acc 100644
--- a/mysql-test/r/alter_table_online.result
+++ b/mysql-test/main/alter_table_online.result
diff --git a/mysql-test/t/alter_table_online.test b/mysql-test/main/alter_table_online.test
index 6ef9661c43b..6ef9661c43b 100644
--- a/mysql-test/t/alter_table_online.test
+++ b/mysql-test/main/alter_table_online.test
diff --git a/mysql-test/r/alter_table_trans.result b/mysql-test/main/alter_table_trans.result
index eaae2039d4c..eaae2039d4c 100644
--- a/mysql-test/r/alter_table_trans.result
+++ b/mysql-test/main/alter_table_trans.result
diff --git a/mysql-test/t/alter_table_trans.test b/mysql-test/main/alter_table_trans.test
index 19b40d84b22..19b40d84b22 100644
--- a/mysql-test/t/alter_table_trans.test
+++ b/mysql-test/main/alter_table_trans.test
diff --git a/mysql-test/r/alter_user.result b/mysql-test/main/alter_user.result
index 76f811f18c7..76f811f18c7 100644
--- a/mysql-test/r/alter_user.result
+++ b/mysql-test/main/alter_user.result
diff --git a/mysql-test/t/alter_user.test b/mysql-test/main/alter_user.test
index ca444f70a70..ca444f70a70 100644
--- a/mysql-test/t/alter_user.test
+++ b/mysql-test/main/alter_user.test
diff --git a/mysql-test/r/analyze.result b/mysql-test/main/analyze.result
index 9dff94ab08c..9dff94ab08c 100644
--- a/mysql-test/r/analyze.result
+++ b/mysql-test/main/analyze.result
diff --git a/mysql-test/t/analyze.test b/mysql-test/main/analyze.test
index 0903db1eca4..0903db1eca4 100644
--- a/mysql-test/t/analyze.test
+++ b/mysql-test/main/analyze.test
diff --git a/mysql-test/r/analyze_debug.result b/mysql-test/main/analyze_debug.result
index 2a11578a841..2a11578a841 100644
--- a/mysql-test/r/analyze_debug.result
+++ b/mysql-test/main/analyze_debug.result
diff --git a/mysql-test/t/analyze_debug.test b/mysql-test/main/analyze_debug.test
index 684011c5aea..684011c5aea 100644
--- a/mysql-test/t/analyze_debug.test
+++ b/mysql-test/main/analyze_debug.test
diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/main/analyze_format_json.result
index 7991379bc55..7991379bc55 100644
--- a/mysql-test/r/analyze_format_json.result
+++ b/mysql-test/main/analyze_format_json.result
diff --git a/mysql-test/t/analyze_format_json.test b/mysql-test/main/analyze_format_json.test
index 915e0c2bf3c..915e0c2bf3c 100644
--- a/mysql-test/t/analyze_format_json.test
+++ b/mysql-test/main/analyze_format_json.test
diff --git a/mysql-test/r/analyze_stmt.result b/mysql-test/main/analyze_stmt.result
index c3c98593210..c3c98593210 100644
--- a/mysql-test/r/analyze_stmt.result
+++ b/mysql-test/main/analyze_stmt.result
diff --git a/mysql-test/t/analyze_stmt.test b/mysql-test/main/analyze_stmt.test
index d02139fe0c8..d02139fe0c8 100644
--- a/mysql-test/t/analyze_stmt.test
+++ b/mysql-test/main/analyze_stmt.test
diff --git a/mysql-test/r/analyze_stmt_orderby.result b/mysql-test/main/analyze_stmt_orderby.result
index dd7bd6b53f7..dd7bd6b53f7 100644
--- a/mysql-test/r/analyze_stmt_orderby.result
+++ b/mysql-test/main/analyze_stmt_orderby.result
diff --git a/mysql-test/t/analyze_stmt_orderby.test b/mysql-test/main/analyze_stmt_orderby.test
index a1cfb58f31a..a1cfb58f31a 100644
--- a/mysql-test/t/analyze_stmt_orderby.test
+++ b/mysql-test/main/analyze_stmt_orderby.test
diff --git a/mysql-test/r/analyze_stmt_privileges.result b/mysql-test/main/analyze_stmt_privileges.result
index d54b5b37863..d54b5b37863 100644
--- a/mysql-test/r/analyze_stmt_privileges.result
+++ b/mysql-test/main/analyze_stmt_privileges.result
diff --git a/mysql-test/t/analyze_stmt_privileges.test b/mysql-test/main/analyze_stmt_privileges.test
index 32ff4ddfb7e..32ff4ddfb7e 100644
--- a/mysql-test/t/analyze_stmt_privileges.test
+++ b/mysql-test/main/analyze_stmt_privileges.test
diff --git a/mysql-test/r/analyze_stmt_privileges2.result b/mysql-test/main/analyze_stmt_privileges2.result
index cf38810b598..cf38810b598 100644
--- a/mysql-test/r/analyze_stmt_privileges2.result
+++ b/mysql-test/main/analyze_stmt_privileges2.result
diff --git a/mysql-test/t/analyze_stmt_privileges2.test b/mysql-test/main/analyze_stmt_privileges2.test
index e3274882ba6..e3274882ba6 100644
--- a/mysql-test/t/analyze_stmt_privileges2.test
+++ b/mysql-test/main/analyze_stmt_privileges2.test
diff --git a/mysql-test/t/analyze_stmt_slow_query_log-master.opt b/mysql-test/main/analyze_stmt_slow_query_log-master.opt
index 1c80c45b0c1..1c80c45b0c1 100644
--- a/mysql-test/t/analyze_stmt_slow_query_log-master.opt
+++ b/mysql-test/main/analyze_stmt_slow_query_log-master.opt
diff --git a/mysql-test/r/analyze_stmt_slow_query_log.result b/mysql-test/main/analyze_stmt_slow_query_log.result
index a0c4b45dee0..a0c4b45dee0 100644
--- a/mysql-test/r/analyze_stmt_slow_query_log.result
+++ b/mysql-test/main/analyze_stmt_slow_query_log.result
diff --git a/mysql-test/t/analyze_stmt_slow_query_log.test b/mysql-test/main/analyze_stmt_slow_query_log.test
index 44865b652cb..44865b652cb 100644
--- a/mysql-test/t/analyze_stmt_slow_query_log.test
+++ b/mysql-test/main/analyze_stmt_slow_query_log.test
diff --git a/mysql-test/r/ansi.result b/mysql-test/main/ansi.result
index 527748e00d5..527748e00d5 100644
--- a/mysql-test/r/ansi.result
+++ b/mysql-test/main/ansi.result
diff --git a/mysql-test/t/ansi.test b/mysql-test/main/ansi.test
index fa7f999954e..fa7f999954e 100644
--- a/mysql-test/t/ansi.test
+++ b/mysql-test/main/ansi.test
diff --git a/mysql-test/r/assign_key_cache-5405.result b/mysql-test/main/assign_key_cache-5405.result
index c4cb56f3f72..c4cb56f3f72 100644
--- a/mysql-test/r/assign_key_cache-5405.result
+++ b/mysql-test/main/assign_key_cache-5405.result
diff --git a/mysql-test/t/assign_key_cache-5405.test b/mysql-test/main/assign_key_cache-5405.test
index 2839e040bd3..2839e040bd3 100644
--- a/mysql-test/t/assign_key_cache-5405.test
+++ b/mysql-test/main/assign_key_cache-5405.test
diff --git a/mysql-test/t/auth_named_pipe-master.opt b/mysql-test/main/auth_named_pipe-master.opt
index e534ae1eae5..e534ae1eae5 100644
--- a/mysql-test/t/auth_named_pipe-master.opt
+++ b/mysql-test/main/auth_named_pipe-master.opt
diff --git a/mysql-test/r/auth_named_pipe.result b/mysql-test/main/auth_named_pipe.result
index fb190ccd149..fb190ccd149 100644
--- a/mysql-test/r/auth_named_pipe.result
+++ b/mysql-test/main/auth_named_pipe.result
diff --git a/mysql-test/t/auth_named_pipe.test b/mysql-test/main/auth_named_pipe.test
index 00577fbef05..00577fbef05 100644
--- a/mysql-test/t/auth_named_pipe.test
+++ b/mysql-test/main/auth_named_pipe.test
diff --git a/mysql-test/t/auth_rpl-slave.opt b/mysql-test/main/auth_rpl-slave.opt
index 1e471f65645..1e471f65645 100644
--- a/mysql-test/t/auth_rpl-slave.opt
+++ b/mysql-test/main/auth_rpl-slave.opt
diff --git a/mysql-test/r/auth_rpl.result b/mysql-test/main/auth_rpl.result
index a3da7985da1..a3da7985da1 100644
--- a/mysql-test/r/auth_rpl.result
+++ b/mysql-test/main/auth_rpl.result
diff --git a/mysql-test/t/auth_rpl.test b/mysql-test/main/auth_rpl.test
index 9b2c4357cf0..9b2c4357cf0 100644
--- a/mysql-test/t/auth_rpl.test
+++ b/mysql-test/main/auth_rpl.test
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/main/auto_increment.result
index 12cbf294b69..12cbf294b69 100644
--- a/mysql-test/r/auto_increment.result
+++ b/mysql-test/main/auto_increment.result
diff --git a/mysql-test/t/auto_increment.test b/mysql-test/main/auto_increment.test
index 7f0ab5dc169..7f0ab5dc169 100644
--- a/mysql-test/t/auto_increment.test
+++ b/mysql-test/main/auto_increment.test
diff --git a/mysql-test/t/auto_increment_ranges.inc b/mysql-test/main/auto_increment_ranges.inc
index dc60f07a700..dc60f07a700 100644
--- a/mysql-test/t/auto_increment_ranges.inc
+++ b/mysql-test/main/auto_increment_ranges.inc
diff --git a/mysql-test/r/auto_increment_ranges_innodb.result b/mysql-test/main/auto_increment_ranges_innodb.result
index 1d827a5a166..1d827a5a166 100644
--- a/mysql-test/r/auto_increment_ranges_innodb.result
+++ b/mysql-test/main/auto_increment_ranges_innodb.result
diff --git a/mysql-test/t/auto_increment_ranges_innodb.test b/mysql-test/main/auto_increment_ranges_innodb.test
index c2afee7ac66..c2afee7ac66 100644
--- a/mysql-test/t/auto_increment_ranges_innodb.test
+++ b/mysql-test/main/auto_increment_ranges_innodb.test
diff --git a/mysql-test/r/auto_increment_ranges_myisam.result b/mysql-test/main/auto_increment_ranges_myisam.result
index e849e980083..e849e980083 100644
--- a/mysql-test/r/auto_increment_ranges_myisam.result
+++ b/mysql-test/main/auto_increment_ranges_myisam.result
diff --git a/mysql-test/t/auto_increment_ranges_myisam.test b/mysql-test/main/auto_increment_ranges_myisam.test
index 90e84377540..90e84377540 100644
--- a/mysql-test/t/auto_increment_ranges_myisam.test
+++ b/mysql-test/main/auto_increment_ranges_myisam.test
diff --git a/mysql-test/r/bad_frm_crash_5029.result b/mysql-test/main/bad_frm_crash_5029.result
index 8aa0065f5ee..8aa0065f5ee 100644
--- a/mysql-test/r/bad_frm_crash_5029.result
+++ b/mysql-test/main/bad_frm_crash_5029.result
diff --git a/mysql-test/t/bad_frm_crash_5029.test b/mysql-test/main/bad_frm_crash_5029.test
index 858922886ab..858922886ab 100644
--- a/mysql-test/t/bad_frm_crash_5029.test
+++ b/mysql-test/main/bad_frm_crash_5029.test
diff --git a/mysql-test/r/bench_count_distinct.result b/mysql-test/main/bench_count_distinct.result
index 8b67e4be38a..8b67e4be38a 100644
--- a/mysql-test/r/bench_count_distinct.result
+++ b/mysql-test/main/bench_count_distinct.result
diff --git a/mysql-test/t/bench_count_distinct.test b/mysql-test/main/bench_count_distinct.test
index 87e3d75e996..87e3d75e996 100644
--- a/mysql-test/t/bench_count_distinct.test
+++ b/mysql-test/main/bench_count_distinct.test
diff --git a/mysql-test/r/bigint.result b/mysql-test/main/bigint.result
index 8f4b287ab21..8f4b287ab21 100644
--- a/mysql-test/r/bigint.result
+++ b/mysql-test/main/bigint.result
diff --git a/mysql-test/t/bigint.test b/mysql-test/main/bigint.test
index ae325c7d7de..ae325c7d7de 100644
--- a/mysql-test/t/bigint.test
+++ b/mysql-test/main/bigint.test
diff --git a/mysql-test/r/binary.result b/mysql-test/main/binary.result
index be87c25e932..be87c25e932 100644
--- a/mysql-test/r/binary.result
+++ b/mysql-test/main/binary.result
diff --git a/mysql-test/t/binary.test b/mysql-test/main/binary.test
index 1cc6ae07675..1cc6ae07675 100644
--- a/mysql-test/t/binary.test
+++ b/mysql-test/main/binary.test
diff --git a/mysql-test/r/binary_to_hex.result b/mysql-test/main/binary_to_hex.result
index 51ee5fa1c62..51ee5fa1c62 100644
--- a/mysql-test/r/binary_to_hex.result
+++ b/mysql-test/main/binary_to_hex.result
diff --git a/mysql-test/t/binary_to_hex.test b/mysql-test/main/binary_to_hex.test
index be4fb301e40..be4fb301e40 100644
--- a/mysql-test/t/binary_to_hex.test
+++ b/mysql-test/main/binary_to_hex.test
diff --git a/mysql-test/r/blackhole.result b/mysql-test/main/blackhole.result
index 36f5459ff85..36f5459ff85 100644
--- a/mysql-test/r/blackhole.result
+++ b/mysql-test/main/blackhole.result
diff --git a/mysql-test/t/blackhole.test b/mysql-test/main/blackhole.test
index 7f394e0f846..7f394e0f846 100644
--- a/mysql-test/t/blackhole.test
+++ b/mysql-test/main/blackhole.test
diff --git a/mysql-test/r/blackhole_plugin.result b/mysql-test/main/blackhole_plugin.result
index 2884441056a..2884441056a 100644
--- a/mysql-test/r/blackhole_plugin.result
+++ b/mysql-test/main/blackhole_plugin.result
diff --git a/mysql-test/t/blackhole_plugin.test b/mysql-test/main/blackhole_plugin.test
index 487fc5656f2..487fc5656f2 100644
--- a/mysql-test/t/blackhole_plugin.test
+++ b/mysql-test/main/blackhole_plugin.test
diff --git a/mysql-test/r/bool.result b/mysql-test/main/bool.result
index 184046a2d6f..184046a2d6f 100644
--- a/mysql-test/r/bool.result
+++ b/mysql-test/main/bool.result
diff --git a/mysql-test/t/bool.test b/mysql-test/main/bool.test
index 34c51c648d3..34c51c648d3 100644
--- a/mysql-test/t/bool.test
+++ b/mysql-test/main/bool.test
diff --git a/mysql-test/t/bootstrap-master.opt b/mysql-test/main/bootstrap-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/bootstrap-master.opt
+++ b/mysql-test/main/bootstrap-master.opt
diff --git a/mysql-test/r/bootstrap.result b/mysql-test/main/bootstrap.result
index 5cefc281996..5cefc281996 100644
--- a/mysql-test/r/bootstrap.result
+++ b/mysql-test/main/bootstrap.result
diff --git a/mysql-test/t/bootstrap.test b/mysql-test/main/bootstrap.test
index 1ae9b13e050..1ae9b13e050 100644
--- a/mysql-test/t/bootstrap.test
+++ b/mysql-test/main/bootstrap.test
diff --git a/mysql-test/r/bug12427262.result b/mysql-test/main/bug12427262.result
index 8ec14efc45e..8ec14efc45e 100644
--- a/mysql-test/r/bug12427262.result
+++ b/mysql-test/main/bug12427262.result
diff --git a/mysql-test/t/bug12427262.test b/mysql-test/main/bug12427262.test
index aca37a651c4..aca37a651c4 100644
--- a/mysql-test/t/bug12427262.test
+++ b/mysql-test/main/bug12427262.test
diff --git a/mysql-test/r/bug13633383.result b/mysql-test/main/bug13633383.result
index ed94ec5b98b..ed94ec5b98b 100644
--- a/mysql-test/r/bug13633383.result
+++ b/mysql-test/main/bug13633383.result
diff --git a/mysql-test/t/bug13633383.test b/mysql-test/main/bug13633383.test
index 29106d379fe..29106d379fe 100644
--- a/mysql-test/t/bug13633383.test
+++ b/mysql-test/main/bug13633383.test
diff --git a/mysql-test/r/bug39022.result b/mysql-test/main/bug39022.result
index 599808ca7d7..599808ca7d7 100644
--- a/mysql-test/r/bug39022.result
+++ b/mysql-test/main/bug39022.result
diff --git a/mysql-test/t/bug39022.test b/mysql-test/main/bug39022.test
index d293788e58e..d293788e58e 100644
--- a/mysql-test/t/bug39022.test
+++ b/mysql-test/main/bug39022.test
diff --git a/mysql-test/t/bug46760-master.opt b/mysql-test/main/bug46760-master.opt
index 2d7be7fb9b1..2d7be7fb9b1 100644
--- a/mysql-test/t/bug46760-master.opt
+++ b/mysql-test/main/bug46760-master.opt
diff --git a/mysql-test/r/bug46760.result b/mysql-test/main/bug46760.result
index f05d6c5ef99..f05d6c5ef99 100644
--- a/mysql-test/r/bug46760.result
+++ b/mysql-test/main/bug46760.result
diff --git a/mysql-test/t/bug46760.test b/mysql-test/main/bug46760.test
index e7f57549250..e7f57549250 100644
--- a/mysql-test/t/bug46760.test
+++ b/mysql-test/main/bug46760.test
diff --git a/mysql-test/t/bug47671-master.opt b/mysql-test/main/bug47671-master.opt
index ad54fbc3467..ad54fbc3467 100644
--- a/mysql-test/t/bug47671-master.opt
+++ b/mysql-test/main/bug47671-master.opt
diff --git a/mysql-test/r/bug47671.result b/mysql-test/main/bug47671.result
index 55e422c12d9..55e422c12d9 100644
--- a/mysql-test/r/bug47671.result
+++ b/mysql-test/main/bug47671.result
diff --git a/mysql-test/t/bug47671.test b/mysql-test/main/bug47671.test
index c3f66a9f502..c3f66a9f502 100644
--- a/mysql-test/t/bug47671.test
+++ b/mysql-test/main/bug47671.test
diff --git a/mysql-test/t/bug58669-master.opt b/mysql-test/main/bug58669-master.opt
index 6d909680527..6d909680527 100644
--- a/mysql-test/t/bug58669-master.opt
+++ b/mysql-test/main/bug58669-master.opt
diff --git a/mysql-test/r/bug58669.result b/mysql-test/main/bug58669.result
index a7d1d7b5581..a7d1d7b5581 100644
--- a/mysql-test/r/bug58669.result
+++ b/mysql-test/main/bug58669.result
diff --git a/mysql-test/t/bug58669.test b/mysql-test/main/bug58669.test
index 77827cde5ba..77827cde5ba 100644
--- a/mysql-test/t/bug58669.test
+++ b/mysql-test/main/bug58669.test
diff --git a/mysql-test/r/bulk_replace.result b/mysql-test/main/bulk_replace.result
index 70f23316829..70f23316829 100644
--- a/mysql-test/r/bulk_replace.result
+++ b/mysql-test/main/bulk_replace.result
diff --git a/mysql-test/t/bulk_replace.test b/mysql-test/main/bulk_replace.test
index 3c623909c56..3c623909c56 100644
--- a/mysql-test/t/bulk_replace.test
+++ b/mysql-test/main/bulk_replace.test
diff --git a/mysql-test/r/cache_innodb.result b/mysql-test/main/cache_innodb.result
index 18ae0ac8a83..18ae0ac8a83 100644
--- a/mysql-test/r/cache_innodb.result
+++ b/mysql-test/main/cache_innodb.result
diff --git a/mysql-test/t/cache_innodb.test b/mysql-test/main/cache_innodb.test
index f7102627506..f7102627506 100644
--- a/mysql-test/t/cache_innodb.test
+++ b/mysql-test/main/cache_innodb.test
diff --git a/mysql-test/r/cache_temporal_4265.result b/mysql-test/main/cache_temporal_4265.result
index 7f215de43fb..7f215de43fb 100644
--- a/mysql-test/r/cache_temporal_4265.result
+++ b/mysql-test/main/cache_temporal_4265.result
diff --git a/mysql-test/t/cache_temporal_4265.test b/mysql-test/main/cache_temporal_4265.test
index c62f3c3c506..c62f3c3c506 100644
--- a/mysql-test/t/cache_temporal_4265.test
+++ b/mysql-test/main/cache_temporal_4265.test
diff --git a/mysql-test/r/case.result b/mysql-test/main/case.result
index f385a3b20c7..f385a3b20c7 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/main/case.result
diff --git a/mysql-test/t/case.test b/mysql-test/main/case.test
index d7dac112b3b..d7dac112b3b 100644
--- a/mysql-test/t/case.test
+++ b/mysql-test/main/case.test
diff --git a/mysql-test/r/cast.result b/mysql-test/main/cast.result
index ca314573581..ca314573581 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/main/cast.result
diff --git a/mysql-test/t/cast.test b/mysql-test/main/cast.test
index b514dbb5b2d..b514dbb5b2d 100644
--- a/mysql-test/t/cast.test
+++ b/mysql-test/main/cast.test
diff --git a/mysql-test/r/change_user.result b/mysql-test/main/change_user.result
index fa934fbf09a..fa934fbf09a 100644
--- a/mysql-test/r/change_user.result
+++ b/mysql-test/main/change_user.result
diff --git a/mysql-test/t/change_user.test b/mysql-test/main/change_user.test
index d191b1c3ca0..d191b1c3ca0 100644
--- a/mysql-test/t/change_user.test
+++ b/mysql-test/main/change_user.test
diff --git a/mysql-test/r/change_user_notembedded.result b/mysql-test/main/change_user_notembedded.result
index 41a154f8d3d..41a154f8d3d 100644
--- a/mysql-test/r/change_user_notembedded.result
+++ b/mysql-test/main/change_user_notembedded.result
diff --git a/mysql-test/t/change_user_notembedded.test b/mysql-test/main/change_user_notembedded.test
index 19421c6dd33..19421c6dd33 100644
--- a/mysql-test/t/change_user_notembedded.test
+++ b/mysql-test/main/change_user_notembedded.test
diff --git a/mysql-test/r/check.result b/mysql-test/main/check.result
index 341c4411298..341c4411298 100644
--- a/mysql-test/r/check.result
+++ b/mysql-test/main/check.result
diff --git a/mysql-test/t/check.test b/mysql-test/main/check.test
index 6a7b7253a59..6a7b7253a59 100644
--- a/mysql-test/t/check.test
+++ b/mysql-test/main/check.test
diff --git a/mysql-test/r/check_constraint.result b/mysql-test/main/check_constraint.result
index 70d64cd6ff7..70d64cd6ff7 100644
--- a/mysql-test/r/check_constraint.result
+++ b/mysql-test/main/check_constraint.result
diff --git a/mysql-test/t/check_constraint.test b/mysql-test/main/check_constraint.test
index 9a77736acd7..9a77736acd7 100644
--- a/mysql-test/t/check_constraint.test
+++ b/mysql-test/main/check_constraint.test
diff --git a/mysql-test/r/check_constraint_show.result b/mysql-test/main/check_constraint_show.result
index def1c488758..def1c488758 100644
--- a/mysql-test/r/check_constraint_show.result
+++ b/mysql-test/main/check_constraint_show.result
diff --git a/mysql-test/t/check_constraint_show.test b/mysql-test/main/check_constraint_show.test
index 4d57f247b5b..4d57f247b5b 100644
--- a/mysql-test/t/check_constraint_show.test
+++ b/mysql-test/main/check_constraint_show.test
diff --git a/mysql-test/r/client_xml.result b/mysql-test/main/client_xml.result
index 6f91c18318c..6f91c18318c 100644
--- a/mysql-test/r/client_xml.result
+++ b/mysql-test/main/client_xml.result
diff --git a/mysql-test/t/client_xml.test b/mysql-test/main/client_xml.test
index 5230922e4b8..5230922e4b8 100644
--- a/mysql-test/t/client_xml.test
+++ b/mysql-test/main/client_xml.test
diff --git a/mysql-test/t/column_compression.inc b/mysql-test/main/column_compression.inc
index 89a96ef67ad..89a96ef67ad 100644
--- a/mysql-test/t/column_compression.inc
+++ b/mysql-test/main/column_compression.inc
diff --git a/mysql-test/r/column_compression.result b/mysql-test/main/column_compression.result
index 243a118a706..243a118a706 100644
--- a/mysql-test/r/column_compression.result
+++ b/mysql-test/main/column_compression.result
diff --git a/mysql-test/t/column_compression.test b/mysql-test/main/column_compression.test
index d3f848144b6..d3f848144b6 100644
--- a/mysql-test/t/column_compression.test
+++ b/mysql-test/main/column_compression.test
diff --git a/mysql-test/r/column_compression_parts.result b/mysql-test/main/column_compression_parts.result
index e0b54aec20c..e0b54aec20c 100644
--- a/mysql-test/r/column_compression_parts.result
+++ b/mysql-test/main/column_compression_parts.result
diff --git a/mysql-test/t/column_compression_parts.test b/mysql-test/main/column_compression_parts.test
index 9a6f63d0cde..9a6f63d0cde 100644
--- a/mysql-test/t/column_compression_parts.test
+++ b/mysql-test/main/column_compression_parts.test
diff --git a/mysql-test/r/column_compression_rpl.result b/mysql-test/main/column_compression_rpl.result
index 3cbc1802939..3cbc1802939 100644
--- a/mysql-test/r/column_compression_rpl.result
+++ b/mysql-test/main/column_compression_rpl.result
diff --git a/mysql-test/t/column_compression_rpl.test b/mysql-test/main/column_compression_rpl.test
index 86c73a77dbd..86c73a77dbd 100644
--- a/mysql-test/t/column_compression_rpl.test
+++ b/mysql-test/main/column_compression_rpl.test
diff --git a/mysql-test/r/comment_column.result b/mysql-test/main/comment_column.result
index a270b30573f..a270b30573f 100644
--- a/mysql-test/r/comment_column.result
+++ b/mysql-test/main/comment_column.result
diff --git a/mysql-test/t/comment_column.test b/mysql-test/main/comment_column.test
index a4f3893dd4a..a4f3893dd4a 100644
--- a/mysql-test/t/comment_column.test
+++ b/mysql-test/main/comment_column.test
diff --git a/mysql-test/r/comment_column2.result b/mysql-test/main/comment_column2.result
index 99402e7f5b4..99402e7f5b4 100644
--- a/mysql-test/r/comment_column2.result
+++ b/mysql-test/main/comment_column2.result
diff --git a/mysql-test/t/comment_column2.test b/mysql-test/main/comment_column2.test
index ea66ab3b066..ea66ab3b066 100644
--- a/mysql-test/t/comment_column2.test
+++ b/mysql-test/main/comment_column2.test
diff --git a/mysql-test/r/comment_index.result b/mysql-test/main/comment_index.result
index 82412871377..82412871377 100644
--- a/mysql-test/r/comment_index.result
+++ b/mysql-test/main/comment_index.result
diff --git a/mysql-test/t/comment_index.test b/mysql-test/main/comment_index.test
index 4ba1f336ddb..4ba1f336ddb 100644
--- a/mysql-test/t/comment_index.test
+++ b/mysql-test/main/comment_index.test
diff --git a/mysql-test/r/comment_table.result b/mysql-test/main/comment_table.result
index 99ecb04a362..99ecb04a362 100644
--- a/mysql-test/r/comment_table.result
+++ b/mysql-test/main/comment_table.result
diff --git a/mysql-test/t/comment_table.test b/mysql-test/main/comment_table.test
index 2a85fbac571..2a85fbac571 100644
--- a/mysql-test/t/comment_table.test
+++ b/mysql-test/main/comment_table.test
diff --git a/mysql-test/r/comments.result b/mysql-test/main/comments.result
index c13eb510326..c13eb510326 100644
--- a/mysql-test/r/comments.result
+++ b/mysql-test/main/comments.result
diff --git a/mysql-test/t/comments.test b/mysql-test/main/comments.test
index 6cf69635d1e..6cf69635d1e 100644
--- a/mysql-test/t/comments.test
+++ b/mysql-test/main/comments.test
diff --git a/mysql-test/r/commit.result b/mysql-test/main/commit.result
index f2e012d4782..f2e012d4782 100644
--- a/mysql-test/r/commit.result
+++ b/mysql-test/main/commit.result
diff --git a/mysql-test/t/commit.test b/mysql-test/main/commit.test
index 762397dfa23..762397dfa23 100644
--- a/mysql-test/t/commit.test
+++ b/mysql-test/main/commit.test
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/main/commit_1innodb.result
index 7d21540b548..7d21540b548 100644
--- a/mysql-test/r/commit_1innodb.result
+++ b/mysql-test/main/commit_1innodb.result
diff --git a/mysql-test/t/commit_1innodb.test b/mysql-test/main/commit_1innodb.test
index a2337094f1a..a2337094f1a 100644
--- a/mysql-test/t/commit_1innodb.test
+++ b/mysql-test/main/commit_1innodb.test
diff --git a/mysql-test/r/compare.result b/mysql-test/main/compare.result
index b4a6b22ba3a..b4a6b22ba3a 100644
--- a/mysql-test/r/compare.result
+++ b/mysql-test/main/compare.result
diff --git a/mysql-test/t/compare.test b/mysql-test/main/compare.test
index d2b2a7e5523..d2b2a7e5523 100644
--- a/mysql-test/t/compare.test
+++ b/mysql-test/main/compare.test
diff --git a/mysql-test/r/compound.result b/mysql-test/main/compound.result
index a54faff4562..a54faff4562 100644
--- a/mysql-test/r/compound.result
+++ b/mysql-test/main/compound.result
diff --git a/mysql-test/t/compound.test b/mysql-test/main/compound.test
index 94a6c18b2f5..94a6c18b2f5 100644
--- a/mysql-test/t/compound.test
+++ b/mysql-test/main/compound.test
diff --git a/mysql-test/r/compress.result b/mysql-test/main/compress.result
index 762ab6630d8..762ab6630d8 100644
--- a/mysql-test/r/compress.result
+++ b/mysql-test/main/compress.result
diff --git a/mysql-test/t/compress.test b/mysql-test/main/compress.test
index 8fc21d9c961..8fc21d9c961 100644
--- a/mysql-test/t/compress.test
+++ b/mysql-test/main/compress.test
diff --git a/mysql-test/t/concurrent_innodb_safelog-master.opt b/mysql-test/main/concurrent_innodb_safelog-master.opt
index 82dec8b25fd..82dec8b25fd 100644
--- a/mysql-test/t/concurrent_innodb_safelog-master.opt
+++ b/mysql-test/main/concurrent_innodb_safelog-master.opt
diff --git a/mysql-test/r/concurrent_innodb_safelog.result b/mysql-test/main/concurrent_innodb_safelog.result
index 27889777ac1..27889777ac1 100644
--- a/mysql-test/r/concurrent_innodb_safelog.result
+++ b/mysql-test/main/concurrent_innodb_safelog.result
diff --git a/mysql-test/t/concurrent_innodb_safelog.test b/mysql-test/main/concurrent_innodb_safelog.test
index 828df9ef717..828df9ef717 100644
--- a/mysql-test/t/concurrent_innodb_safelog.test
+++ b/mysql-test/main/concurrent_innodb_safelog.test
diff --git a/mysql-test/t/concurrent_innodb_unsafelog-master.opt b/mysql-test/main/concurrent_innodb_unsafelog-master.opt
index ea9c1b860e9..ea9c1b860e9 100644
--- a/mysql-test/t/concurrent_innodb_unsafelog-master.opt
+++ b/mysql-test/main/concurrent_innodb_unsafelog-master.opt
diff --git a/mysql-test/r/concurrent_innodb_unsafelog.result b/mysql-test/main/concurrent_innodb_unsafelog.result
index 39e757aeeb1..39e757aeeb1 100644
--- a/mysql-test/r/concurrent_innodb_unsafelog.result
+++ b/mysql-test/main/concurrent_innodb_unsafelog.result
diff --git a/mysql-test/t/concurrent_innodb_unsafelog.test b/mysql-test/main/concurrent_innodb_unsafelog.test
index e2c03655e43..e2c03655e43 100644
--- a/mysql-test/t/concurrent_innodb_unsafelog.test
+++ b/mysql-test/main/concurrent_innodb_unsafelog.test
diff --git a/mysql-test/t/connect.cnf b/mysql-test/main/connect.cnf
index 4f8d8b06b63..4f8d8b06b63 100644
--- a/mysql-test/t/connect.cnf
+++ b/mysql-test/main/connect.cnf
diff --git a/mysql-test/r/connect.result b/mysql-test/main/connect.result
index f36483e6d8d..f36483e6d8d 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/main/connect.result
diff --git a/mysql-test/t/connect.test b/mysql-test/main/connect.test
index 20989e70ef9..20989e70ef9 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/main/connect.test
diff --git a/mysql-test/t/connect2.cnf b/mysql-test/main/connect2.cnf
index 0acd221b871..0acd221b871 100644
--- a/mysql-test/t/connect2.cnf
+++ b/mysql-test/main/connect2.cnf
diff --git a/mysql-test/r/connect2.result b/mysql-test/main/connect2.result
index 5430626a533..5430626a533 100644
--- a/mysql-test/r/connect2.result
+++ b/mysql-test/main/connect2.result
diff --git a/mysql-test/t/connect2.test b/mysql-test/main/connect2.test
index 9d2a438aa0a..9d2a438aa0a 100644
--- a/mysql-test/t/connect2.test
+++ b/mysql-test/main/connect2.test
diff --git a/mysql-test/r/consistent_snapshot.result b/mysql-test/main/consistent_snapshot.result
index b978f1dd9d2..b978f1dd9d2 100644
--- a/mysql-test/r/consistent_snapshot.result
+++ b/mysql-test/main/consistent_snapshot.result
diff --git a/mysql-test/t/consistent_snapshot.test b/mysql-test/main/consistent_snapshot.test
index a481e757bed..a481e757bed 100644
--- a/mysql-test/t/consistent_snapshot.test
+++ b/mysql-test/main/consistent_snapshot.test
diff --git a/mysql-test/r/constraints.result b/mysql-test/main/constraints.result
index fe9398ea8ce..fe9398ea8ce 100644
--- a/mysql-test/r/constraints.result
+++ b/mysql-test/main/constraints.result
diff --git a/mysql-test/t/constraints.test b/mysql-test/main/constraints.test
index 1997c23bfa9..1997c23bfa9 100644
--- a/mysql-test/t/constraints.test
+++ b/mysql-test/main/constraints.test
diff --git a/mysql-test/r/contributors.result b/mysql-test/main/contributors.result
index 927c0bcccbf..927c0bcccbf 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/main/contributors.result
diff --git a/mysql-test/t/contributors.test b/mysql-test/main/contributors.test
index e463c4a888b..e463c4a888b 100644
--- a/mysql-test/t/contributors.test
+++ b/mysql-test/main/contributors.test
diff --git a/mysql-test/r/count_distinct.result b/mysql-test/main/count_distinct.result
index 760b2710586..760b2710586 100644
--- a/mysql-test/r/count_distinct.result
+++ b/mysql-test/main/count_distinct.result
diff --git a/mysql-test/t/count_distinct.test b/mysql-test/main/count_distinct.test
index 86045e862e7..86045e862e7 100644
--- a/mysql-test/t/count_distinct.test
+++ b/mysql-test/main/count_distinct.test
diff --git a/mysql-test/t/count_distinct2-master.opt b/mysql-test/main/count_distinct2-master.opt
index 2fa4c2b903d..2fa4c2b903d 100644
--- a/mysql-test/t/count_distinct2-master.opt
+++ b/mysql-test/main/count_distinct2-master.opt
diff --git a/mysql-test/r/count_distinct2.result b/mysql-test/main/count_distinct2.result
index b92665b5c56..b92665b5c56 100644
--- a/mysql-test/r/count_distinct2.result
+++ b/mysql-test/main/count_distinct2.result
diff --git a/mysql-test/t/count_distinct2.test b/mysql-test/main/count_distinct2.test
index 95086ad04aa..95086ad04aa 100644
--- a/mysql-test/t/count_distinct2.test
+++ b/mysql-test/main/count_distinct2.test
diff --git a/mysql-test/r/count_distinct3.result b/mysql-test/main/count_distinct3.result
index 840c26669a1..840c26669a1 100644
--- a/mysql-test/r/count_distinct3.result
+++ b/mysql-test/main/count_distinct3.result
diff --git a/mysql-test/t/count_distinct3.test b/mysql-test/main/count_distinct3.test
index 8aecd628423..8aecd628423 100644
--- a/mysql-test/t/count_distinct3.test
+++ b/mysql-test/main/count_distinct3.test
diff --git a/mysql-test/t/crash_commit_before-master.opt b/mysql-test/main/crash_commit_before-master.opt
index 9bcf94dca97..9bcf94dca97 100644
--- a/mysql-test/t/crash_commit_before-master.opt
+++ b/mysql-test/main/crash_commit_before-master.opt
diff --git a/mysql-test/r/crash_commit_before.result b/mysql-test/main/crash_commit_before.result
index 22d39e1ddbd..22d39e1ddbd 100644
--- a/mysql-test/r/crash_commit_before.result
+++ b/mysql-test/main/crash_commit_before.result
diff --git a/mysql-test/t/crash_commit_before.test b/mysql-test/main/crash_commit_before.test
index 93b96de6e53..93b96de6e53 100644
--- a/mysql-test/t/crash_commit_before.test
+++ b/mysql-test/main/crash_commit_before.test
diff --git a/mysql-test/r/create-big.result b/mysql-test/main/create-big.result
index d041419443e..d041419443e 100644
--- a/mysql-test/r/create-big.result
+++ b/mysql-test/main/create-big.result
diff --git a/mysql-test/t/create-big.test b/mysql-test/main/create-big.test
index 7f20a8b42af..7f20a8b42af 100644
--- a/mysql-test/t/create-big.test
+++ b/mysql-test/main/create-big.test
diff --git a/mysql-test/r/create-uca.result b/mysql-test/main/create-uca.result
index f405cb72b40..f405cb72b40 100644
--- a/mysql-test/r/create-uca.result
+++ b/mysql-test/main/create-uca.result
diff --git a/mysql-test/t/create-uca.test b/mysql-test/main/create-uca.test
index 0acb51f7286..0acb51f7286 100644
--- a/mysql-test/t/create-uca.test
+++ b/mysql-test/main/create-uca.test
diff --git a/mysql-test/r/create.result b/mysql-test/main/create.result
index dc34185ad2e..dc34185ad2e 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/main/create.result
diff --git a/mysql-test/t/create.test b/mysql-test/main/create.test
index af5c427852c..af5c427852c 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/main/create.test
diff --git a/mysql-test/r/create_delayed.result b/mysql-test/main/create_delayed.result
index c36a8e60cbb..c36a8e60cbb 100644
--- a/mysql-test/r/create_delayed.result
+++ b/mysql-test/main/create_delayed.result
diff --git a/mysql-test/t/create_delayed.test b/mysql-test/main/create_delayed.test
index e99886d97d1..e99886d97d1 100644
--- a/mysql-test/t/create_delayed.test
+++ b/mysql-test/main/create_delayed.test
diff --git a/mysql-test/r/create_drop_binlog.result b/mysql-test/main/create_drop_binlog.result
index be40fcc140a..be40fcc140a 100644
--- a/mysql-test/r/create_drop_binlog.result
+++ b/mysql-test/main/create_drop_binlog.result
diff --git a/mysql-test/t/create_drop_binlog.test b/mysql-test/main/create_drop_binlog.test
index 6b2b1bbf1f5..6b2b1bbf1f5 100644
--- a/mysql-test/t/create_drop_binlog.test
+++ b/mysql-test/main/create_drop_binlog.test
diff --git a/mysql-test/r/create_drop_db.result b/mysql-test/main/create_drop_db.result
index aee88703c9b..aee88703c9b 100644
--- a/mysql-test/r/create_drop_db.result
+++ b/mysql-test/main/create_drop_db.result
diff --git a/mysql-test/t/create_drop_db.test b/mysql-test/main/create_drop_db.test
index 13391c35a4d..13391c35a4d 100644
--- a/mysql-test/t/create_drop_db.test
+++ b/mysql-test/main/create_drop_db.test
diff --git a/mysql-test/r/create_drop_event.result b/mysql-test/main/create_drop_event.result
index 0d69e85dfd6..0d69e85dfd6 100644
--- a/mysql-test/r/create_drop_event.result
+++ b/mysql-test/main/create_drop_event.result
diff --git a/mysql-test/t/create_drop_event.test b/mysql-test/main/create_drop_event.test
index d885a39e453..d885a39e453 100644
--- a/mysql-test/t/create_drop_event.test
+++ b/mysql-test/main/create_drop_event.test
diff --git a/mysql-test/r/create_drop_function.result b/mysql-test/main/create_drop_function.result
index 3ba6581d61b..3ba6581d61b 100644
--- a/mysql-test/r/create_drop_function.result
+++ b/mysql-test/main/create_drop_function.result
diff --git a/mysql-test/t/create_drop_function.test b/mysql-test/main/create_drop_function.test
index e4d3d684cd5..e4d3d684cd5 100644
--- a/mysql-test/t/create_drop_function.test
+++ b/mysql-test/main/create_drop_function.test
diff --git a/mysql-test/r/create_drop_index.result b/mysql-test/main/create_drop_index.result
index 7df6aeb5838..7df6aeb5838 100644
--- a/mysql-test/r/create_drop_index.result
+++ b/mysql-test/main/create_drop_index.result
diff --git a/mysql-test/t/create_drop_index.test b/mysql-test/main/create_drop_index.test
index 4c861266325..4c861266325 100644
--- a/mysql-test/t/create_drop_index.test
+++ b/mysql-test/main/create_drop_index.test
diff --git a/mysql-test/r/create_drop_procedure.result b/mysql-test/main/create_drop_procedure.result
index 02c71ab6446..02c71ab6446 100644
--- a/mysql-test/r/create_drop_procedure.result
+++ b/mysql-test/main/create_drop_procedure.result
diff --git a/mysql-test/t/create_drop_procedure.test b/mysql-test/main/create_drop_procedure.test
index 50e6b1cc61c..50e6b1cc61c 100644
--- a/mysql-test/t/create_drop_procedure.test
+++ b/mysql-test/main/create_drop_procedure.test
diff --git a/mysql-test/r/create_drop_role.result b/mysql-test/main/create_drop_role.result
index 498dd4c1c02..498dd4c1c02 100644
--- a/mysql-test/r/create_drop_role.result
+++ b/mysql-test/main/create_drop_role.result
diff --git a/mysql-test/t/create_drop_role.test b/mysql-test/main/create_drop_role.test
index be33083e6c4..be33083e6c4 100644
--- a/mysql-test/t/create_drop_role.test
+++ b/mysql-test/main/create_drop_role.test
diff --git a/mysql-test/r/create_drop_server.result b/mysql-test/main/create_drop_server.result
index 29c4fe7e123..29c4fe7e123 100644
--- a/mysql-test/r/create_drop_server.result
+++ b/mysql-test/main/create_drop_server.result
diff --git a/mysql-test/t/create_drop_server.test b/mysql-test/main/create_drop_server.test
index 1b9e9b2a788..1b9e9b2a788 100644
--- a/mysql-test/t/create_drop_server.test
+++ b/mysql-test/main/create_drop_server.test
diff --git a/mysql-test/r/create_drop_trigger.result b/mysql-test/main/create_drop_trigger.result
index d2857a0cb79..d2857a0cb79 100644
--- a/mysql-test/r/create_drop_trigger.result
+++ b/mysql-test/main/create_drop_trigger.result
diff --git a/mysql-test/t/create_drop_trigger.test b/mysql-test/main/create_drop_trigger.test
index 0f19f5cf09f..0f19f5cf09f 100644
--- a/mysql-test/t/create_drop_trigger.test
+++ b/mysql-test/main/create_drop_trigger.test
diff --git a/mysql-test/r/create_drop_udf.result b/mysql-test/main/create_drop_udf.result
index 40da0b62a3a..40da0b62a3a 100644
--- a/mysql-test/r/create_drop_udf.result
+++ b/mysql-test/main/create_drop_udf.result
diff --git a/mysql-test/t/create_drop_udf.test b/mysql-test/main/create_drop_udf.test
index 5908bf04e90..5908bf04e90 100644
--- a/mysql-test/t/create_drop_udf.test
+++ b/mysql-test/main/create_drop_udf.test
diff --git a/mysql-test/r/create_drop_user.result b/mysql-test/main/create_drop_user.result
index dd75d1c257a..dd75d1c257a 100644
--- a/mysql-test/r/create_drop_user.result
+++ b/mysql-test/main/create_drop_user.result
diff --git a/mysql-test/t/create_drop_user.test b/mysql-test/main/create_drop_user.test
index 949782a2daf..949782a2daf 100644
--- a/mysql-test/t/create_drop_user.test
+++ b/mysql-test/main/create_drop_user.test
diff --git a/mysql-test/r/create_drop_view.result b/mysql-test/main/create_drop_view.result
index 9d7e42552bf..9d7e42552bf 100644
--- a/mysql-test/r/create_drop_view.result
+++ b/mysql-test/main/create_drop_view.result
diff --git a/mysql-test/t/create_drop_view.test b/mysql-test/main/create_drop_view.test
index 5f5df43a7e0..5f5df43a7e0 100644
--- a/mysql-test/t/create_drop_view.test
+++ b/mysql-test/main/create_drop_view.test
diff --git a/mysql-test/r/create_not_windows.result b/mysql-test/main/create_not_windows.result
index abe76fd3fbe..abe76fd3fbe 100644
--- a/mysql-test/r/create_not_windows.result
+++ b/mysql-test/main/create_not_windows.result
diff --git a/mysql-test/t/create_not_windows.test b/mysql-test/main/create_not_windows.test
index b612e31e3aa..b612e31e3aa 100644
--- a/mysql-test/t/create_not_windows.test
+++ b/mysql-test/main/create_not_windows.test
diff --git a/mysql-test/t/create_or_replace-master.opt b/mysql-test/main/create_or_replace-master.opt
index e94228f2f33..e94228f2f33 100644
--- a/mysql-test/t/create_or_replace-master.opt
+++ b/mysql-test/main/create_or_replace-master.opt
diff --git a/mysql-test/r/create_or_replace.result b/mysql-test/main/create_or_replace.result
index e26884f1cbf..e26884f1cbf 100644
--- a/mysql-test/r/create_or_replace.result
+++ b/mysql-test/main/create_or_replace.result
diff --git a/mysql-test/t/create_or_replace.test b/mysql-test/main/create_or_replace.test
index 4ef4189694b..4ef4189694b 100644
--- a/mysql-test/t/create_or_replace.test
+++ b/mysql-test/main/create_or_replace.test
diff --git a/mysql-test/r/create_or_replace2.result b/mysql-test/main/create_or_replace2.result
index 47431212492..47431212492 100644
--- a/mysql-test/r/create_or_replace2.result
+++ b/mysql-test/main/create_or_replace2.result
diff --git a/mysql-test/t/create_or_replace2.test b/mysql-test/main/create_or_replace2.test
index 199e5523811..199e5523811 100644
--- a/mysql-test/t/create_or_replace2.test
+++ b/mysql-test/main/create_or_replace2.test
diff --git a/mysql-test/r/create_or_replace_permission.result b/mysql-test/main/create_or_replace_permission.result
index b9938e4270a..b9938e4270a 100644
--- a/mysql-test/r/create_or_replace_permission.result
+++ b/mysql-test/main/create_or_replace_permission.result
diff --git a/mysql-test/t/create_or_replace_permission.test b/mysql-test/main/create_or_replace_permission.test
index 0e833a125bd..0e833a125bd 100644
--- a/mysql-test/t/create_or_replace_permission.test
+++ b/mysql-test/main/create_or_replace_permission.test
diff --git a/mysql-test/r/create_select_tmp.result b/mysql-test/main/create_select_tmp.result
index f499e539baf..f499e539baf 100644
--- a/mysql-test/r/create_select_tmp.result
+++ b/mysql-test/main/create_select_tmp.result
diff --git a/mysql-test/t/create_select_tmp.test b/mysql-test/main/create_select_tmp.test
index ef3315aed97..ef3315aed97 100644
--- a/mysql-test/t/create_select_tmp.test
+++ b/mysql-test/main/create_select_tmp.test
diff --git a/mysql-test/r/create_user.result b/mysql-test/main/create_user.result
index 8001b43221b..8001b43221b 100644
--- a/mysql-test/r/create_user.result
+++ b/mysql-test/main/create_user.result
diff --git a/mysql-test/t/create_user.test b/mysql-test/main/create_user.test
index f04cb3e302a..f04cb3e302a 100644
--- a/mysql-test/t/create_user.test
+++ b/mysql-test/main/create_user.test
diff --git a/mysql-test/r/create_w_max_indexes_128.result b/mysql-test/main/create_w_max_indexes_128.result
index cd23e493f5c..cd23e493f5c 100644
--- a/mysql-test/r/create_w_max_indexes_128.result
+++ b/mysql-test/main/create_w_max_indexes_128.result
diff --git a/mysql-test/t/create_w_max_indexes_128.test b/mysql-test/main/create_w_max_indexes_128.test
index 46aa3c3b671..46aa3c3b671 100644
--- a/mysql-test/t/create_w_max_indexes_128.test
+++ b/mysql-test/main/create_w_max_indexes_128.test
diff --git a/mysql-test/r/create_w_max_indexes_64.result b/mysql-test/main/create_w_max_indexes_64.result
index c937f3af312..c937f3af312 100644
--- a/mysql-test/r/create_w_max_indexes_64.result
+++ b/mysql-test/main/create_w_max_indexes_64.result
diff --git a/mysql-test/t/create_w_max_indexes_64.test b/mysql-test/main/create_w_max_indexes_64.test
index 6e614ecf2e5..6e614ecf2e5 100644
--- a/mysql-test/t/create_w_max_indexes_64.test
+++ b/mysql-test/main/create_w_max_indexes_64.test
diff --git a/mysql-test/r/cte_grant.result b/mysql-test/main/cte_grant.result
index 2ee31be3435..2ee31be3435 100644
--- a/mysql-test/r/cte_grant.result
+++ b/mysql-test/main/cte_grant.result
diff --git a/mysql-test/t/cte_grant.test b/mysql-test/main/cte_grant.test
index c6627c05829..c6627c05829 100644
--- a/mysql-test/t/cte_grant.test
+++ b/mysql-test/main/cte_grant.test
diff --git a/mysql-test/r/cte_nonrecursive.result b/mysql-test/main/cte_nonrecursive.result
index 534a386fe12..534a386fe12 100644
--- a/mysql-test/r/cte_nonrecursive.result
+++ b/mysql-test/main/cte_nonrecursive.result
diff --git a/mysql-test/t/cte_nonrecursive.test b/mysql-test/main/cte_nonrecursive.test
index 5e1770496f6..5e1770496f6 100644
--- a/mysql-test/t/cte_nonrecursive.test
+++ b/mysql-test/main/cte_nonrecursive.test
diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/main/cte_recursive.result
index 15d4fc1a01f..15d4fc1a01f 100644
--- a/mysql-test/r/cte_recursive.result
+++ b/mysql-test/main/cte_recursive.result
diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/main/cte_recursive.test
index 7ed55a1daaa..7ed55a1daaa 100644
--- a/mysql-test/t/cte_recursive.test
+++ b/mysql-test/main/cte_recursive.test
diff --git a/mysql-test/r/ctype_ascii.result b/mysql-test/main/ctype_ascii.result
index 06362486073..06362486073 100644
--- a/mysql-test/r/ctype_ascii.result
+++ b/mysql-test/main/ctype_ascii.result
diff --git a/mysql-test/t/ctype_ascii.test b/mysql-test/main/ctype_ascii.test
index 2a5118c7d34..2a5118c7d34 100644
--- a/mysql-test/t/ctype_ascii.test
+++ b/mysql-test/main/ctype_ascii.test
diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/main/ctype_big5.result
index 2db4da51667..2db4da51667 100644
--- a/mysql-test/r/ctype_big5.result
+++ b/mysql-test/main/ctype_big5.result
diff --git a/mysql-test/t/ctype_big5.test b/mysql-test/main/ctype_big5.test
index 410203c7c86..410203c7c86 100644
--- a/mysql-test/t/ctype_big5.test
+++ b/mysql-test/main/ctype_big5.test
diff --git a/mysql-test/r/ctype_binary.result b/mysql-test/main/ctype_binary.result
index 0afe5298411..0afe5298411 100644
--- a/mysql-test/r/ctype_binary.result
+++ b/mysql-test/main/ctype_binary.result
diff --git a/mysql-test/t/ctype_binary.test b/mysql-test/main/ctype_binary.test
index 8da4eaff572..8da4eaff572 100644
--- a/mysql-test/t/ctype_binary.test
+++ b/mysql-test/main/ctype_binary.test
diff --git a/mysql-test/r/ctype_collate.result b/mysql-test/main/ctype_collate.result
index 5e8c5adac8f..5e8c5adac8f 100644
--- a/mysql-test/r/ctype_collate.result
+++ b/mysql-test/main/ctype_collate.result
diff --git a/mysql-test/t/ctype_collate.test b/mysql-test/main/ctype_collate.test
index 6704395a0a1..6704395a0a1 100644
--- a/mysql-test/t/ctype_collate.test
+++ b/mysql-test/main/ctype_collate.test
diff --git a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/main/ctype_cp1250_ch.result
index 5799331f73e..5799331f73e 100644
--- a/mysql-test/r/ctype_cp1250_ch.result
+++ b/mysql-test/main/ctype_cp1250_ch.result
diff --git a/mysql-test/t/ctype_cp1250_ch.test b/mysql-test/main/ctype_cp1250_ch.test
index 0bbe4cafca6..0bbe4cafca6 100644
--- a/mysql-test/t/ctype_cp1250_ch.test
+++ b/mysql-test/main/ctype_cp1250_ch.test
diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result
index 2da53740619..2da53740619 100644
--- a/mysql-test/r/ctype_cp1251.result
+++ b/mysql-test/main/ctype_cp1251.result
diff --git a/mysql-test/t/ctype_cp1251.test b/mysql-test/main/ctype_cp1251.test
index 97978463407..97978463407 100644
--- a/mysql-test/t/ctype_cp1251.test
+++ b/mysql-test/main/ctype_cp1251.test
diff --git a/mysql-test/r/ctype_cp850.result b/mysql-test/main/ctype_cp850.result
index c028f72b58a..c028f72b58a 100644
--- a/mysql-test/r/ctype_cp850.result
+++ b/mysql-test/main/ctype_cp850.result
diff --git a/mysql-test/t/ctype_cp850.test b/mysql-test/main/ctype_cp850.test
index 358829eb351..358829eb351 100644
--- a/mysql-test/t/ctype_cp850.test
+++ b/mysql-test/main/ctype_cp850.test
diff --git a/mysql-test/r/ctype_cp932.result b/mysql-test/main/ctype_cp932.result
index eb714e9f8d7..eb714e9f8d7 100644
--- a/mysql-test/r/ctype_cp932.result
+++ b/mysql-test/main/ctype_cp932.result
diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/main/ctype_cp932.test
index 2486ca8a79e..2486ca8a79e 100644
--- a/mysql-test/t/ctype_cp932.test
+++ b/mysql-test/main/ctype_cp932.test
diff --git a/mysql-test/r/ctype_cp932_binlog_row.result b/mysql-test/main/ctype_cp932_binlog_row.result
index b42489677f0..b42489677f0 100644
--- a/mysql-test/r/ctype_cp932_binlog_row.result
+++ b/mysql-test/main/ctype_cp932_binlog_row.result
diff --git a/mysql-test/t/ctype_cp932_binlog_row.test b/mysql-test/main/ctype_cp932_binlog_row.test
index 38614ea45c0..38614ea45c0 100644
--- a/mysql-test/t/ctype_cp932_binlog_row.test
+++ b/mysql-test/main/ctype_cp932_binlog_row.test
diff --git a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/main/ctype_cp932_binlog_stm.result
index f49400b63ff..f49400b63ff 100644
--- a/mysql-test/r/ctype_cp932_binlog_stm.result
+++ b/mysql-test/main/ctype_cp932_binlog_stm.result
diff --git a/mysql-test/t/ctype_cp932_binlog_stm.test b/mysql-test/main/ctype_cp932_binlog_stm.test
index 78e5725218a..78e5725218a 100644
--- a/mysql-test/t/ctype_cp932_binlog_stm.test
+++ b/mysql-test/main/ctype_cp932_binlog_stm.test
diff --git a/mysql-test/r/ctype_create.result b/mysql-test/main/ctype_create.result
index 4128be82c23..4128be82c23 100644
--- a/mysql-test/r/ctype_create.result
+++ b/mysql-test/main/ctype_create.result
diff --git a/mysql-test/t/ctype_create.test b/mysql-test/main/ctype_create.test
index 61fc5292094..61fc5292094 100644
--- a/mysql-test/t/ctype_create.test
+++ b/mysql-test/main/ctype_create.test
diff --git a/mysql-test/r/ctype_errors.result b/mysql-test/main/ctype_errors.result
index 6f9e14a8942..6f9e14a8942 100644
--- a/mysql-test/r/ctype_errors.result
+++ b/mysql-test/main/ctype_errors.result
diff --git a/mysql-test/t/ctype_errors.test b/mysql-test/main/ctype_errors.test
index b228a3b9f19..b228a3b9f19 100644
--- a/mysql-test/t/ctype_errors.test
+++ b/mysql-test/main/ctype_errors.test
diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result
index bc7b4b9ef9d..bc7b4b9ef9d 100644
--- a/mysql-test/r/ctype_eucjpms.result
+++ b/mysql-test/main/ctype_eucjpms.result
diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/main/ctype_eucjpms.test
index c69abc32a03..c69abc32a03 100644
--- a/mysql-test/t/ctype_eucjpms.test
+++ b/mysql-test/main/ctype_eucjpms.test
diff --git a/mysql-test/r/ctype_euckr.result b/mysql-test/main/ctype_euckr.result
index 3fb6f98b2eb..3fb6f98b2eb 100644
--- a/mysql-test/r/ctype_euckr.result
+++ b/mysql-test/main/ctype_euckr.result
diff --git a/mysql-test/t/ctype_euckr.test b/mysql-test/main/ctype_euckr.test
index 950c60c47e5..950c60c47e5 100644
--- a/mysql-test/t/ctype_euckr.test
+++ b/mysql-test/main/ctype_euckr.test
diff --git a/mysql-test/r/ctype_filename.result b/mysql-test/main/ctype_filename.result
index c6d7d1e39b9..c6d7d1e39b9 100644
--- a/mysql-test/r/ctype_filename.result
+++ b/mysql-test/main/ctype_filename.result
diff --git a/mysql-test/t/ctype_filename.test b/mysql-test/main/ctype_filename.test
index 7ec07293a2b..7ec07293a2b 100644
--- a/mysql-test/t/ctype_filename.test
+++ b/mysql-test/main/ctype_filename.test
diff --git a/mysql-test/t/ctype_filesystem-master.opt b/mysql-test/main/ctype_filesystem-master.opt
index 44127f68664..44127f68664 100644
--- a/mysql-test/t/ctype_filesystem-master.opt
+++ b/mysql-test/main/ctype_filesystem-master.opt
diff --git a/mysql-test/r/ctype_filesystem.result b/mysql-test/main/ctype_filesystem.result
index b461cf2a1a4..b461cf2a1a4 100644
--- a/mysql-test/r/ctype_filesystem.result
+++ b/mysql-test/main/ctype_filesystem.result
diff --git a/mysql-test/t/ctype_filesystem.test b/mysql-test/main/ctype_filesystem.test
index 42f1ef06478..42f1ef06478 100644
--- a/mysql-test/t/ctype_filesystem.test
+++ b/mysql-test/main/ctype_filesystem.test
diff --git a/mysql-test/r/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result
index c3c2eee9b1c..c3c2eee9b1c 100644
--- a/mysql-test/r/ctype_gb2312.result
+++ b/mysql-test/main/ctype_gb2312.result
diff --git a/mysql-test/t/ctype_gb2312.test b/mysql-test/main/ctype_gb2312.test
index 4489168a163..4489168a163 100644
--- a/mysql-test/t/ctype_gb2312.test
+++ b/mysql-test/main/ctype_gb2312.test
diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/main/ctype_gbk.result
index 5244d6eb333..5244d6eb333 100644
--- a/mysql-test/r/ctype_gbk.result
+++ b/mysql-test/main/ctype_gbk.result
diff --git a/mysql-test/t/ctype_gbk.test b/mysql-test/main/ctype_gbk.test
index a3dc7f4af44..a3dc7f4af44 100644
--- a/mysql-test/t/ctype_gbk.test
+++ b/mysql-test/main/ctype_gbk.test
diff --git a/mysql-test/r/ctype_gbk_binlog.result b/mysql-test/main/ctype_gbk_binlog.result
index df927af9a6b..df927af9a6b 100644
--- a/mysql-test/r/ctype_gbk_binlog.result
+++ b/mysql-test/main/ctype_gbk_binlog.result
diff --git a/mysql-test/t/ctype_gbk_binlog.test b/mysql-test/main/ctype_gbk_binlog.test
index e4c1bee19af..e4c1bee19af 100644
--- a/mysql-test/t/ctype_gbk_binlog.test
+++ b/mysql-test/main/ctype_gbk_binlog.test
diff --git a/mysql-test/r/ctype_gbk_export_import.result b/mysql-test/main/ctype_gbk_export_import.result
index d7d5aa98f02..d7d5aa98f02 100644
--- a/mysql-test/r/ctype_gbk_export_import.result
+++ b/mysql-test/main/ctype_gbk_export_import.result
diff --git a/mysql-test/t/ctype_gbk_export_import.test b/mysql-test/main/ctype_gbk_export_import.test
index f0d0b70fce6..f0d0b70fce6 100644
--- a/mysql-test/t/ctype_gbk_export_import.test
+++ b/mysql-test/main/ctype_gbk_export_import.test
diff --git a/mysql-test/r/ctype_hebrew.result b/mysql-test/main/ctype_hebrew.result
index d938b2e47f3..d938b2e47f3 100644
--- a/mysql-test/r/ctype_hebrew.result
+++ b/mysql-test/main/ctype_hebrew.result
diff --git a/mysql-test/t/ctype_hebrew.test b/mysql-test/main/ctype_hebrew.test
index f786d05141d..f786d05141d 100644
--- a/mysql-test/t/ctype_hebrew.test
+++ b/mysql-test/main/ctype_hebrew.test
diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/main/ctype_latin1.result
index d5906cb74dd..d5906cb74dd 100644
--- a/mysql-test/r/ctype_latin1.result
+++ b/mysql-test/main/ctype_latin1.result
diff --git a/mysql-test/t/ctype_latin1.test b/mysql-test/main/ctype_latin1.test
index 38f147708b8..38f147708b8 100644
--- a/mysql-test/t/ctype_latin1.test
+++ b/mysql-test/main/ctype_latin1.test
diff --git a/mysql-test/t/ctype_latin1_de-master.opt b/mysql-test/main/ctype_latin1_de-master.opt
index 0c072424de9..0c072424de9 100644
--- a/mysql-test/t/ctype_latin1_de-master.opt
+++ b/mysql-test/main/ctype_latin1_de-master.opt
diff --git a/mysql-test/r/ctype_latin1_de.result b/mysql-test/main/ctype_latin1_de.result
index 2d3803fba18..2d3803fba18 100644
--- a/mysql-test/r/ctype_latin1_de.result
+++ b/mysql-test/main/ctype_latin1_de.result
diff --git a/mysql-test/t/ctype_latin1_de.test b/mysql-test/main/ctype_latin1_de.test
index 29a52c36db6..29a52c36db6 100644
--- a/mysql-test/t/ctype_latin1_de.test
+++ b/mysql-test/main/ctype_latin1_de.test
diff --git a/mysql-test/r/ctype_latin2.result b/mysql-test/main/ctype_latin2.result
index d8fd22b5322..d8fd22b5322 100644
--- a/mysql-test/r/ctype_latin2.result
+++ b/mysql-test/main/ctype_latin2.result
diff --git a/mysql-test/t/ctype_latin2.test b/mysql-test/main/ctype_latin2.test
index e80515993f2..e80515993f2 100644
--- a/mysql-test/t/ctype_latin2.test
+++ b/mysql-test/main/ctype_latin2.test
diff --git a/mysql-test/r/ctype_latin2_ch.result b/mysql-test/main/ctype_latin2_ch.result
index a396bc77fb6..a396bc77fb6 100644
--- a/mysql-test/r/ctype_latin2_ch.result
+++ b/mysql-test/main/ctype_latin2_ch.result
diff --git a/mysql-test/t/ctype_latin2_ch.test b/mysql-test/main/ctype_latin2_ch.test
index 06ccd2c9782..06ccd2c9782 100644
--- a/mysql-test/t/ctype_latin2_ch.test
+++ b/mysql-test/main/ctype_latin2_ch.test
diff --git a/mysql-test/t/ctype_ldml-master.opt b/mysql-test/main/ctype_ldml-master.opt
index 250dd2cb5a2..250dd2cb5a2 100644
--- a/mysql-test/t/ctype_ldml-master.opt
+++ b/mysql-test/main/ctype_ldml-master.opt
diff --git a/mysql-test/r/ctype_ldml.result b/mysql-test/main/ctype_ldml.result
index 3ce50331ed0..3ce50331ed0 100644
--- a/mysql-test/r/ctype_ldml.result
+++ b/mysql-test/main/ctype_ldml.result
diff --git a/mysql-test/t/ctype_ldml.test b/mysql-test/main/ctype_ldml.test
index a6cba4b9780..a6cba4b9780 100644
--- a/mysql-test/t/ctype_ldml.test
+++ b/mysql-test/main/ctype_ldml.test
diff --git a/mysql-test/r/ctype_like_range.result b/mysql-test/main/ctype_like_range.result
index d8e621fd056..d8e621fd056 100644
--- a/mysql-test/r/ctype_like_range.result
+++ b/mysql-test/main/ctype_like_range.result
diff --git a/mysql-test/t/ctype_like_range.test b/mysql-test/main/ctype_like_range.test
index 3055abe5f59..3055abe5f59 100644
--- a/mysql-test/t/ctype_like_range.test
+++ b/mysql-test/main/ctype_like_range.test
diff --git a/mysql-test/r/ctype_many.result b/mysql-test/main/ctype_many.result
index d73a478b0c0..d73a478b0c0 100644
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/main/ctype_many.result
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/main/ctype_many.test
index a619b16416c..a619b16416c 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/main/ctype_many.test
diff --git a/mysql-test/r/ctype_mb.result b/mysql-test/main/ctype_mb.result
index 015457cc1b3..015457cc1b3 100644
--- a/mysql-test/r/ctype_mb.result
+++ b/mysql-test/main/ctype_mb.result
diff --git a/mysql-test/t/ctype_mb.test b/mysql-test/main/ctype_mb.test
index cd5ab503d55..cd5ab503d55 100644
--- a/mysql-test/t/ctype_mb.test
+++ b/mysql-test/main/ctype_mb.test
diff --git a/mysql-test/r/ctype_nopad_8bit.result b/mysql-test/main/ctype_nopad_8bit.result
index b5dadc2f5da..b5dadc2f5da 100644
--- a/mysql-test/r/ctype_nopad_8bit.result
+++ b/mysql-test/main/ctype_nopad_8bit.result
diff --git a/mysql-test/t/ctype_nopad_8bit.test b/mysql-test/main/ctype_nopad_8bit.test
index fc60bbd7759..fc60bbd7759 100644
--- a/mysql-test/t/ctype_nopad_8bit.test
+++ b/mysql-test/main/ctype_nopad_8bit.test
diff --git a/mysql-test/r/ctype_partitions.result b/mysql-test/main/ctype_partitions.result
index a39ecc11529..a39ecc11529 100644
--- a/mysql-test/r/ctype_partitions.result
+++ b/mysql-test/main/ctype_partitions.result
diff --git a/mysql-test/t/ctype_partitions.test b/mysql-test/main/ctype_partitions.test
index f80a2c98a1b..f80a2c98a1b 100644
--- a/mysql-test/t/ctype_partitions.test
+++ b/mysql-test/main/ctype_partitions.test
diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/main/ctype_recoding.result
index 806d9dc6997..806d9dc6997 100644
--- a/mysql-test/r/ctype_recoding.result
+++ b/mysql-test/main/ctype_recoding.result
diff --git a/mysql-test/t/ctype_recoding.test b/mysql-test/main/ctype_recoding.test
index ba2e65b3626..ba2e65b3626 100644
--- a/mysql-test/t/ctype_recoding.test
+++ b/mysql-test/main/ctype_recoding.test
diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index c19a0008e11..c19a0008e11 100644
--- a/mysql-test/r/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
diff --git a/mysql-test/t/ctype_sjis.test b/mysql-test/main/ctype_sjis.test
index 9a8ce414c14..9a8ce414c14 100644
--- a/mysql-test/t/ctype_sjis.test
+++ b/mysql-test/main/ctype_sjis.test
diff --git a/mysql-test/r/ctype_swe7.result b/mysql-test/main/ctype_swe7.result
index 63da7d362ca..63da7d362ca 100644
--- a/mysql-test/r/ctype_swe7.result
+++ b/mysql-test/main/ctype_swe7.result
diff --git a/mysql-test/t/ctype_swe7.test b/mysql-test/main/ctype_swe7.test
index 2e648a89406..2e648a89406 100644
--- a/mysql-test/t/ctype_swe7.test
+++ b/mysql-test/main/ctype_swe7.test
diff --git a/mysql-test/r/ctype_tis620.result b/mysql-test/main/ctype_tis620.result
index cf66c81c647..cf66c81c647 100644
--- a/mysql-test/r/ctype_tis620.result
+++ b/mysql-test/main/ctype_tis620.result
diff --git a/mysql-test/t/ctype_tis620.test b/mysql-test/main/ctype_tis620.test
index 7bc248aec2b..7bc248aec2b 100644
--- a/mysql-test/t/ctype_tis620.test
+++ b/mysql-test/main/ctype_tis620.test
diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/main/ctype_uca.result
index 725e744c44e..725e744c44e 100644
--- a/mysql-test/r/ctype_uca.result
+++ b/mysql-test/main/ctype_uca.result
diff --git a/mysql-test/t/ctype_uca.test b/mysql-test/main/ctype_uca.test
index 15a945fde6d..15a945fde6d 100644
--- a/mysql-test/t/ctype_uca.test
+++ b/mysql-test/main/ctype_uca.test
diff --git a/mysql-test/r/ctype_uca_innodb.result b/mysql-test/main/ctype_uca_innodb.result
index c04a99c8cd3..c04a99c8cd3 100644
--- a/mysql-test/r/ctype_uca_innodb.result
+++ b/mysql-test/main/ctype_uca_innodb.result
diff --git a/mysql-test/t/ctype_uca_innodb.test b/mysql-test/main/ctype_uca_innodb.test
index cb6caff4a03..cb6caff4a03 100644
--- a/mysql-test/t/ctype_uca_innodb.test
+++ b/mysql-test/main/ctype_uca_innodb.test
diff --git a/mysql-test/r/ctype_uca_partitions.result b/mysql-test/main/ctype_uca_partitions.result
index 154de148ee0..154de148ee0 100644
--- a/mysql-test/r/ctype_uca_partitions.result
+++ b/mysql-test/main/ctype_uca_partitions.result
diff --git a/mysql-test/t/ctype_uca_partitions.test b/mysql-test/main/ctype_uca_partitions.test
index 5734bb52008..5734bb52008 100644
--- a/mysql-test/t/ctype_uca_partitions.test
+++ b/mysql-test/main/ctype_uca_partitions.test
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/main/ctype_ucs.result
index fcc8f27010c..fcc8f27010c 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/main/ctype_ucs.result
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/main/ctype_ucs.test
index d7a4fd48ccd..d7a4fd48ccd 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/main/ctype_ucs.test
diff --git a/mysql-test/t/ctype_ucs2_def-master.opt b/mysql-test/main/ctype_ucs2_def-master.opt
index 711ec42bd8a..711ec42bd8a 100644
--- a/mysql-test/t/ctype_ucs2_def-master.opt
+++ b/mysql-test/main/ctype_ucs2_def-master.opt
diff --git a/mysql-test/r/ctype_ucs2_def.result b/mysql-test/main/ctype_ucs2_def.result
index 9d8f5181103..9d8f5181103 100644
--- a/mysql-test/r/ctype_ucs2_def.result
+++ b/mysql-test/main/ctype_ucs2_def.result
diff --git a/mysql-test/t/ctype_ucs2_def.test b/mysql-test/main/ctype_ucs2_def.test
index e297fa5ccf1..e297fa5ccf1 100644
--- a/mysql-test/t/ctype_ucs2_def.test
+++ b/mysql-test/main/ctype_ucs2_def.test
diff --git a/mysql-test/t/ctype_ucs2_query_cache-master.opt b/mysql-test/main/ctype_ucs2_query_cache-master.opt
index 413ebb9f898..413ebb9f898 100644
--- a/mysql-test/t/ctype_ucs2_query_cache-master.opt
+++ b/mysql-test/main/ctype_ucs2_query_cache-master.opt
diff --git a/mysql-test/r/ctype_ucs2_query_cache.result b/mysql-test/main/ctype_ucs2_query_cache.result
index eba7f2fb0fc..eba7f2fb0fc 100644
--- a/mysql-test/r/ctype_ucs2_query_cache.result
+++ b/mysql-test/main/ctype_ucs2_query_cache.result
diff --git a/mysql-test/t/ctype_ucs2_query_cache.test b/mysql-test/main/ctype_ucs2_query_cache.test
index ace826aec44..ace826aec44 100644
--- a/mysql-test/t/ctype_ucs2_query_cache.test
+++ b/mysql-test/main/ctype_ucs2_query_cache.test
diff --git a/mysql-test/r/ctype_ucs2_uca.result b/mysql-test/main/ctype_ucs2_uca.result
index 44a623842c6..44a623842c6 100644
--- a/mysql-test/r/ctype_ucs2_uca.result
+++ b/mysql-test/main/ctype_ucs2_uca.result
diff --git a/mysql-test/t/ctype_ucs2_uca.test b/mysql-test/main/ctype_ucs2_uca.test
index 0aed0956f6c..0aed0956f6c 100644
--- a/mysql-test/t/ctype_ucs2_uca.test
+++ b/mysql-test/main/ctype_ucs2_uca.test
diff --git a/mysql-test/r/ctype_ujis.result b/mysql-test/main/ctype_ujis.result
index cb9de83fedc..cb9de83fedc 100644
--- a/mysql-test/r/ctype_ujis.result
+++ b/mysql-test/main/ctype_ujis.result
diff --git a/mysql-test/t/ctype_ujis.test b/mysql-test/main/ctype_ujis.test
index ff9c61c05ba..ff9c61c05ba 100644
--- a/mysql-test/t/ctype_ujis.test
+++ b/mysql-test/main/ctype_ujis.test
diff --git a/mysql-test/r/ctype_ujis_ucs2.result b/mysql-test/main/ctype_ujis_ucs2.result
index 77961046346..77961046346 100644
--- a/mysql-test/r/ctype_ujis_ucs2.result
+++ b/mysql-test/main/ctype_ujis_ucs2.result
diff --git a/mysql-test/t/ctype_ujis_ucs2.test b/mysql-test/main/ctype_ujis_ucs2.test
index 8616eea36d1..8616eea36d1 100644
--- a/mysql-test/t/ctype_ujis_ucs2.test
+++ b/mysql-test/main/ctype_ujis_ucs2.test
diff --git a/mysql-test/r/ctype_upgrade.result b/mysql-test/main/ctype_upgrade.result
index 5f0be66f8fb..5f0be66f8fb 100644
--- a/mysql-test/r/ctype_upgrade.result
+++ b/mysql-test/main/ctype_upgrade.result
diff --git a/mysql-test/t/ctype_upgrade.test b/mysql-test/main/ctype_upgrade.test
index 62567c5afe4..62567c5afe4 100644
--- a/mysql-test/t/ctype_upgrade.test
+++ b/mysql-test/main/ctype_upgrade.test
diff --git a/mysql-test/r/ctype_utf16.result b/mysql-test/main/ctype_utf16.result
index 8de21a14bd9..8de21a14bd9 100644
--- a/mysql-test/r/ctype_utf16.result
+++ b/mysql-test/main/ctype_utf16.result
diff --git a/mysql-test/t/ctype_utf16.test b/mysql-test/main/ctype_utf16.test
index 526f5251055..526f5251055 100644
--- a/mysql-test/t/ctype_utf16.test
+++ b/mysql-test/main/ctype_utf16.test
diff --git a/mysql-test/t/ctype_utf16_def-master.opt b/mysql-test/main/ctype_utf16_def-master.opt
index 55bb5d14bbd..55bb5d14bbd 100644
--- a/mysql-test/t/ctype_utf16_def-master.opt
+++ b/mysql-test/main/ctype_utf16_def-master.opt
diff --git a/mysql-test/r/ctype_utf16_def.result b/mysql-test/main/ctype_utf16_def.result
index 98b6f7d913d..98b6f7d913d 100644
--- a/mysql-test/r/ctype_utf16_def.result
+++ b/mysql-test/main/ctype_utf16_def.result
diff --git a/mysql-test/t/ctype_utf16_def.test b/mysql-test/main/ctype_utf16_def.test
index 0829cd53285..0829cd53285 100644
--- a/mysql-test/t/ctype_utf16_def.test
+++ b/mysql-test/main/ctype_utf16_def.test
diff --git a/mysql-test/r/ctype_utf16_uca.result b/mysql-test/main/ctype_utf16_uca.result
index 0cb9c4c74c1..0cb9c4c74c1 100644
--- a/mysql-test/r/ctype_utf16_uca.result
+++ b/mysql-test/main/ctype_utf16_uca.result
diff --git a/mysql-test/t/ctype_utf16_uca.test b/mysql-test/main/ctype_utf16_uca.test
index 46d572fbe81..46d572fbe81 100644
--- a/mysql-test/t/ctype_utf16_uca.test
+++ b/mysql-test/main/ctype_utf16_uca.test
diff --git a/mysql-test/r/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result
index 0fedff7d3bf..0fedff7d3bf 100644
--- a/mysql-test/r/ctype_utf16le.result
+++ b/mysql-test/main/ctype_utf16le.result
diff --git a/mysql-test/t/ctype_utf16le.test b/mysql-test/main/ctype_utf16le.test
index 79cf875852a..79cf875852a 100644
--- a/mysql-test/t/ctype_utf16le.test
+++ b/mysql-test/main/ctype_utf16le.test
diff --git a/mysql-test/r/ctype_utf32.result b/mysql-test/main/ctype_utf32.result
index 59ce4c2f445..59ce4c2f445 100644
--- a/mysql-test/r/ctype_utf32.result
+++ b/mysql-test/main/ctype_utf32.result
diff --git a/mysql-test/t/ctype_utf32.test b/mysql-test/main/ctype_utf32.test
index 6f036898d15..6f036898d15 100644
--- a/mysql-test/t/ctype_utf32.test
+++ b/mysql-test/main/ctype_utf32.test
diff --git a/mysql-test/r/ctype_utf32_uca.result b/mysql-test/main/ctype_utf32_uca.result
index a112918c0c3..a112918c0c3 100644
--- a/mysql-test/r/ctype_utf32_uca.result
+++ b/mysql-test/main/ctype_utf32_uca.result
diff --git a/mysql-test/t/ctype_utf32_uca.test b/mysql-test/main/ctype_utf32_uca.test
index 334d8fd1d48..334d8fd1d48 100644
--- a/mysql-test/t/ctype_utf32_uca.test
+++ b/mysql-test/main/ctype_utf32_uca.test
diff --git a/mysql-test/t/ctype_utf8-master.opt b/mysql-test/main/ctype_utf8-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/ctype_utf8-master.opt
+++ b/mysql-test/main/ctype_utf8-master.opt
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index 10d0efeff3c..10d0efeff3c 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/main/ctype_utf8.test
index 20a60d370a0..20a60d370a0 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/main/ctype_utf8.test
diff --git a/mysql-test/r/ctype_utf8_uca.result b/mysql-test/main/ctype_utf8_uca.result
index 23e9802b61a..23e9802b61a 100644
--- a/mysql-test/r/ctype_utf8_uca.result
+++ b/mysql-test/main/ctype_utf8_uca.result
diff --git a/mysql-test/t/ctype_utf8_uca.test b/mysql-test/main/ctype_utf8_uca.test
index 0879b4d2810..0879b4d2810 100644
--- a/mysql-test/t/ctype_utf8_uca.test
+++ b/mysql-test/main/ctype_utf8_uca.test
diff --git a/mysql-test/t/ctype_utf8mb4-master.opt b/mysql-test/main/ctype_utf8mb4-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/ctype_utf8mb4-master.opt
+++ b/mysql-test/main/ctype_utf8mb4-master.opt
diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result
index fbe95d9f44b..fbe95d9f44b 100644
--- a/mysql-test/r/ctype_utf8mb4.result
+++ b/mysql-test/main/ctype_utf8mb4.result
diff --git a/mysql-test/t/ctype_utf8mb4.test b/mysql-test/main/ctype_utf8mb4.test
index 7aa644fe8a9..7aa644fe8a9 100644
--- a/mysql-test/t/ctype_utf8mb4.test
+++ b/mysql-test/main/ctype_utf8mb4.test
diff --git a/mysql-test/r/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result
index d82ed89be9c..d82ed89be9c 100644
--- a/mysql-test/r/ctype_utf8mb4_heap.result
+++ b/mysql-test/main/ctype_utf8mb4_heap.result
diff --git a/mysql-test/t/ctype_utf8mb4_heap.test b/mysql-test/main/ctype_utf8mb4_heap.test
index 5611ea9746f..5611ea9746f 100644
--- a/mysql-test/t/ctype_utf8mb4_heap.test
+++ b/mysql-test/main/ctype_utf8mb4_heap.test
diff --git a/mysql-test/t/ctype_utf8mb4_innodb-master.opt b/mysql-test/main/ctype_utf8mb4_innodb-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/ctype_utf8mb4_innodb-master.opt
+++ b/mysql-test/main/ctype_utf8mb4_innodb-master.opt
diff --git a/mysql-test/r/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result
index 956b2f83d9e..956b2f83d9e 100644
--- a/mysql-test/r/ctype_utf8mb4_innodb.result
+++ b/mysql-test/main/ctype_utf8mb4_innodb.result
diff --git a/mysql-test/t/ctype_utf8mb4_innodb.test b/mysql-test/main/ctype_utf8mb4_innodb.test
index 3bf0612a1ab..3bf0612a1ab 100644
--- a/mysql-test/t/ctype_utf8mb4_innodb.test
+++ b/mysql-test/main/ctype_utf8mb4_innodb.test
diff --git a/mysql-test/r/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result
index fd58e12542c..fd58e12542c 100644
--- a/mysql-test/r/ctype_utf8mb4_myisam.result
+++ b/mysql-test/main/ctype_utf8mb4_myisam.result
diff --git a/mysql-test/t/ctype_utf8mb4_myisam.test b/mysql-test/main/ctype_utf8mb4_myisam.test
index e7ec43633f9..e7ec43633f9 100644
--- a/mysql-test/t/ctype_utf8mb4_myisam.test
+++ b/mysql-test/main/ctype_utf8mb4_myisam.test
diff --git a/mysql-test/r/ctype_utf8mb4_uca.result b/mysql-test/main/ctype_utf8mb4_uca.result
index 0712ca63abd..0712ca63abd 100644
--- a/mysql-test/r/ctype_utf8mb4_uca.result
+++ b/mysql-test/main/ctype_utf8mb4_uca.result
diff --git a/mysql-test/t/ctype_utf8mb4_uca.test b/mysql-test/main/ctype_utf8mb4_uca.test
index 160cb48bad6..160cb48bad6 100644
--- a/mysql-test/t/ctype_utf8mb4_uca.test
+++ b/mysql-test/main/ctype_utf8mb4_uca.test
diff --git a/mysql-test/r/custom_aggregate_functions.result b/mysql-test/main/custom_aggregate_functions.result
index 67be44c43f7..67be44c43f7 100644
--- a/mysql-test/r/custom_aggregate_functions.result
+++ b/mysql-test/main/custom_aggregate_functions.result
diff --git a/mysql-test/t/custom_aggregate_functions.test b/mysql-test/main/custom_aggregate_functions.test
index 13eb3bed2af..13eb3bed2af 100644
--- a/mysql-test/t/custom_aggregate_functions.test
+++ b/mysql-test/main/custom_aggregate_functions.test
diff --git a/mysql-test/t/date_formats-master.opt b/mysql-test/main/date_formats-master.opt
index ab243fe729c..ab243fe729c 100644
--- a/mysql-test/t/date_formats-master.opt
+++ b/mysql-test/main/date_formats-master.opt
diff --git a/mysql-test/r/date_formats.result b/mysql-test/main/date_formats.result
index 16dbdf7969c..16dbdf7969c 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/main/date_formats.result
diff --git a/mysql-test/t/date_formats.test b/mysql-test/main/date_formats.test
index 3bf6fabbf6d..3bf6fabbf6d 100644
--- a/mysql-test/t/date_formats.test
+++ b/mysql-test/main/date_formats.test
diff --git a/mysql-test/r/datetime_456.result b/mysql-test/main/datetime_456.result
index 44351a821bc..44351a821bc 100644
--- a/mysql-test/r/datetime_456.result
+++ b/mysql-test/main/datetime_456.result
diff --git a/mysql-test/t/datetime_456.test b/mysql-test/main/datetime_456.test
index 0c187959d52..0c187959d52 100644
--- a/mysql-test/t/datetime_456.test
+++ b/mysql-test/main/datetime_456.test
diff --git a/mysql-test/r/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result
index ba43c1c867f..ba43c1c867f 100644
--- a/mysql-test/r/ddl_i18n_koi8r.result
+++ b/mysql-test/main/ddl_i18n_koi8r.result
diff --git a/mysql-test/t/ddl_i18n_koi8r.test b/mysql-test/main/ddl_i18n_koi8r.test
index 5e2417fab4d..5e2417fab4d 100644
--- a/mysql-test/t/ddl_i18n_koi8r.test
+++ b/mysql-test/main/ddl_i18n_koi8r.test
diff --git a/mysql-test/r/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result
index 47786196037..47786196037 100644
--- a/mysql-test/r/ddl_i18n_utf8.result
+++ b/mysql-test/main/ddl_i18n_utf8.result
diff --git a/mysql-test/t/ddl_i18n_utf8.test b/mysql-test/main/ddl_i18n_utf8.test
index 9fecad87515..9fecad87515 100644
--- a/mysql-test/t/ddl_i18n_utf8.test
+++ b/mysql-test/main/ddl_i18n_utf8.test
diff --git a/mysql-test/r/deadlock_innodb.result b/mysql-test/main/deadlock_innodb.result
index af78a6aa9d5..af78a6aa9d5 100644
--- a/mysql-test/r/deadlock_innodb.result
+++ b/mysql-test/main/deadlock_innodb.result
diff --git a/mysql-test/t/deadlock_innodb.test b/mysql-test/main/deadlock_innodb.test
index 08e3e256790..08e3e256790 100644
--- a/mysql-test/t/deadlock_innodb.test
+++ b/mysql-test/main/deadlock_innodb.test
diff --git a/mysql-test/r/debug_sync.result b/mysql-test/main/debug_sync.result
index bb9ae1a417d..bb9ae1a417d 100644
--- a/mysql-test/r/debug_sync.result
+++ b/mysql-test/main/debug_sync.result
diff --git a/mysql-test/t/debug_sync.test b/mysql-test/main/debug_sync.test
index 89414939f59..89414939f59 100644
--- a/mysql-test/t/debug_sync.test
+++ b/mysql-test/main/debug_sync.test
diff --git a/mysql-test/r/default.result b/mysql-test/main/default.result
index 3b1912f4a55..3b1912f4a55 100644
--- a/mysql-test/r/default.result
+++ b/mysql-test/main/default.result
diff --git a/mysql-test/t/default.test b/mysql-test/main/default.test
index 44778bc568a..44778bc568a 100644
--- a/mysql-test/t/default.test
+++ b/mysql-test/main/default.test
diff --git a/mysql-test/r/default_debug.result b/mysql-test/main/default_debug.result
index 3f5b0b7896c..3f5b0b7896c 100644
--- a/mysql-test/r/default_debug.result
+++ b/mysql-test/main/default_debug.result
diff --git a/mysql-test/t/default_debug.test b/mysql-test/main/default_debug.test
index cdde26569ca..cdde26569ca 100644
--- a/mysql-test/t/default_debug.test
+++ b/mysql-test/main/default_debug.test
diff --git a/mysql-test/r/default_session.result b/mysql-test/main/default_session.result
index 6c0bcad0cb3..6c0bcad0cb3 100644
--- a/mysql-test/r/default_session.result
+++ b/mysql-test/main/default_session.result
diff --git a/mysql-test/t/default_session.test b/mysql-test/main/default_session.test
index 7796354ffd4..7796354ffd4 100644
--- a/mysql-test/t/default_session.test
+++ b/mysql-test/main/default_session.test
diff --git a/mysql-test/r/default_storage_engine.result b/mysql-test/main/default_storage_engine.result
index da3350c6eaf..da3350c6eaf 100644
--- a/mysql-test/r/default_storage_engine.result
+++ b/mysql-test/main/default_storage_engine.result
diff --git a/mysql-test/t/default_storage_engine.test b/mysql-test/main/default_storage_engine.test
index dd6f4728f47..dd6f4728f47 100644
--- a/mysql-test/t/default_storage_engine.test
+++ b/mysql-test/main/default_storage_engine.test
diff --git a/mysql-test/r/delayed.result b/mysql-test/main/delayed.result
index d54fa40f2da..d54fa40f2da 100644
--- a/mysql-test/r/delayed.result
+++ b/mysql-test/main/delayed.result
diff --git a/mysql-test/t/delayed.test b/mysql-test/main/delayed.test
index dea16c84a51..573985fec1f 100644
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/main/delayed.test
@@ -14,7 +14,7 @@
 
 # limit the test to engines which support INSERT DELAYED
 disable_query_log;
---require r/true.require
+--require include/true.require
 select @@global.storage_engine in
 ("memory","myisam","archive","blackhole") and
 @@session.storage_engine in
diff --git a/mysql-test/r/delete.result b/mysql-test/main/delete.result
index ed3683d52f9..ed3683d52f9 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/main/delete.result
diff --git a/mysql-test/t/delete.test b/mysql-test/main/delete.test
index c82420640c2..c82420640c2 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/main/delete.test
diff --git a/mysql-test/r/delete_returning.result b/mysql-test/main/delete_returning.result
index 3a95de0cdca..3a95de0cdca 100644
--- a/mysql-test/r/delete_returning.result
+++ b/mysql-test/main/delete_returning.result
diff --git a/mysql-test/t/delete_returning.test b/mysql-test/main/delete_returning.test
index 4448a6bcccd..4448a6bcccd 100644
--- a/mysql-test/t/delete_returning.test
+++ b/mysql-test/main/delete_returning.test
diff --git a/mysql-test/r/delete_returning_grant.result b/mysql-test/main/delete_returning_grant.result
index b41d48a7112..b41d48a7112 100644
--- a/mysql-test/r/delete_returning_grant.result
+++ b/mysql-test/main/delete_returning_grant.result
diff --git a/mysql-test/t/delete_returning_grant.test b/mysql-test/main/delete_returning_grant.test
index 67613603a72..67613603a72 100644
--- a/mysql-test/t/delete_returning_grant.test
+++ b/mysql-test/main/delete_returning_grant.test
diff --git a/mysql-test/r/delete_use_source.result b/mysql-test/main/delete_use_source.result
index 08da8901528..08da8901528 100644
--- a/mysql-test/r/delete_use_source.result
+++ b/mysql-test/main/delete_use_source.result
diff --git a/mysql-test/t/delete_use_source.test b/mysql-test/main/delete_use_source.test
index 93065c6fe23..93065c6fe23 100644
--- a/mysql-test/t/delete_use_source.test
+++ b/mysql-test/main/delete_use_source.test
diff --git a/mysql-test/t/delimiter_case_mdev_10728.sql b/mysql-test/main/delimiter_case_mdev_10728.sql
index 72a1dcd9a9e..72a1dcd9a9e 100644
--- a/mysql-test/t/delimiter_case_mdev_10728.sql
+++ b/mysql-test/main/delimiter_case_mdev_10728.sql
diff --git a/mysql-test/r/delimiter_command_case_sensitivity.result b/mysql-test/main/delimiter_command_case_sensitivity.result
index 6ed281c757a..6ed281c757a 100644
--- a/mysql-test/r/delimiter_command_case_sensitivity.result
+++ b/mysql-test/main/delimiter_command_case_sensitivity.result
diff --git a/mysql-test/main/delimiter_command_case_sensitivity.test b/mysql-test/main/delimiter_command_case_sensitivity.test
new file mode 100644
index 00000000000..bee5b34b3a7
--- /dev/null
+++ b/mysql-test/main/delimiter_command_case_sensitivity.test
@@ -0,0 +1,4 @@
+source include/not_embedded.inc;
+
+# MDEV-10728
+--exec $MYSQL --default-character-set=binary < "main/delimiter_case_mdev_10728.sql"
diff --git a/mysql-test/r/deprecated_features.result b/mysql-test/main/deprecated_features.result
index fc6c86d065d..fc6c86d065d 100644
--- a/mysql-test/r/deprecated_features.result
+++ b/mysql-test/main/deprecated_features.result
diff --git a/mysql-test/t/deprecated_features.test b/mysql-test/main/deprecated_features.test
index a9c5a5ae5ff..a9c5a5ae5ff 100644
--- a/mysql-test/t/deprecated_features.test
+++ b/mysql-test/main/deprecated_features.test
diff --git a/mysql-test/r/derived.result b/mysql-test/main/derived.result
index ebbc08aa958..ebbc08aa958 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/main/derived.result
diff --git a/mysql-test/t/derived.test b/mysql-test/main/derived.test
index 466d79af409..466d79af409 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/main/derived.test
diff --git a/mysql-test/r/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result
index 32d3c88cc8d..32d3c88cc8d 100644
--- a/mysql-test/r/derived_cond_pushdown.result
+++ b/mysql-test/main/derived_cond_pushdown.result
diff --git a/mysql-test/t/derived_cond_pushdown.test b/mysql-test/main/derived_cond_pushdown.test
index e728a9590a1..e728a9590a1 100644
--- a/mysql-test/t/derived_cond_pushdown.test
+++ b/mysql-test/main/derived_cond_pushdown.test
diff --git a/mysql-test/r/derived_opt.result b/mysql-test/main/derived_opt.result
index 6e4ea1b5d36..6e4ea1b5d36 100644
--- a/mysql-test/r/derived_opt.result
+++ b/mysql-test/main/derived_opt.result
diff --git a/mysql-test/t/derived_opt.test b/mysql-test/main/derived_opt.test
index 7f19553e4e5..7f19553e4e5 100644
--- a/mysql-test/t/derived_opt.test
+++ b/mysql-test/main/derived_opt.test
diff --git a/mysql-test/r/derived_view.result b/mysql-test/main/derived_view.result
index 85e56ff176e..85e56ff176e 100644
--- a/mysql-test/r/derived_view.result
+++ b/mysql-test/main/derived_view.result
diff --git a/mysql-test/t/derived_view.test b/mysql-test/main/derived_view.test
index 9b0cf9dca7d..9b0cf9dca7d 100644
--- a/mysql-test/t/derived_view.test
+++ b/mysql-test/main/derived_view.test
diff --git a/mysql-test/r/dirty_close.result b/mysql-test/main/dirty_close.result
index d13fdb09192..d13fdb09192 100644
--- a/mysql-test/r/dirty_close.result
+++ b/mysql-test/main/dirty_close.result
diff --git a/mysql-test/t/dirty_close.test b/mysql-test/main/dirty_close.test
index e49618170ab..e49618170ab 100644
--- a/mysql-test/t/dirty_close.test
+++ b/mysql-test/main/dirty_close.test
diff --git a/mysql-test/disabled.def b/mysql-test/main/disabled.def
index b489139a59f..b489139a59f 100644
--- a/mysql-test/disabled.def
+++ b/mysql-test/main/disabled.def
diff --git a/mysql-test/r/distinct.result b/mysql-test/main/distinct.result
index 926dc17d0c4..926dc17d0c4 100644
--- a/mysql-test/r/distinct.result
+++ b/mysql-test/main/distinct.result
diff --git a/mysql-test/t/distinct.test b/mysql-test/main/distinct.test
index 7cf3d6810bb..7cf3d6810bb 100644
--- a/mysql-test/t/distinct.test
+++ b/mysql-test/main/distinct.test
diff --git a/mysql-test/r/drop-no_root.result b/mysql-test/main/drop-no_root.result
index 3e1f2fe2cf0..3e1f2fe2cf0 100644
--- a/mysql-test/r/drop-no_root.result
+++ b/mysql-test/main/drop-no_root.result
diff --git a/mysql-test/t/drop-no_root.test b/mysql-test/main/drop-no_root.test
index 8fb5b3f74a8..8fb5b3f74a8 100644
--- a/mysql-test/t/drop-no_root.test
+++ b/mysql-test/main/drop-no_root.test
diff --git a/mysql-test/r/drop.result b/mysql-test/main/drop.result
index 88e070af88c..88e070af88c 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/main/drop.result
diff --git a/mysql-test/t/drop.test b/mysql-test/main/drop.test
index 6f506dd7215..6f506dd7215 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/main/drop.test
diff --git a/mysql-test/r/drop_bad_db_type.result b/mysql-test/main/drop_bad_db_type.result
index de22373e0fd..de22373e0fd 100644
--- a/mysql-test/r/drop_bad_db_type.result
+++ b/mysql-test/main/drop_bad_db_type.result
diff --git a/mysql-test/t/drop_bad_db_type.test b/mysql-test/main/drop_bad_db_type.test
index 00b79dabddf..00b79dabddf 100644
--- a/mysql-test/t/drop_bad_db_type.test
+++ b/mysql-test/main/drop_bad_db_type.test
diff --git a/mysql-test/r/dyncol.result b/mysql-test/main/dyncol.result
index 7a5eeac67cc..7a5eeac67cc 100644
--- a/mysql-test/r/dyncol.result
+++ b/mysql-test/main/dyncol.result
diff --git a/mysql-test/t/dyncol.test b/mysql-test/main/dyncol.test
index f2c0a31c898..f2c0a31c898 100644
--- a/mysql-test/t/dyncol.test
+++ b/mysql-test/main/dyncol.test
diff --git a/mysql-test/r/empty_server_name-8224.result b/mysql-test/main/empty_server_name-8224.result
index 4bf592c8932..4bf592c8932 100644
--- a/mysql-test/r/empty_server_name-8224.result
+++ b/mysql-test/main/empty_server_name-8224.result
diff --git a/mysql-test/t/empty_server_name-8224.test b/mysql-test/main/empty_server_name-8224.test
index b15e9d82eb8..b15e9d82eb8 100644
--- a/mysql-test/t/empty_server_name-8224.test
+++ b/mysql-test/main/empty_server_name-8224.test
diff --git a/mysql-test/r/empty_string_literal.result b/mysql-test/main/empty_string_literal.result
index 2ca491a7dd8..2ca491a7dd8 100644
--- a/mysql-test/r/empty_string_literal.result
+++ b/mysql-test/main/empty_string_literal.result
diff --git a/mysql-test/t/empty_string_literal.test b/mysql-test/main/empty_string_literal.test
index 71e98d872bb..71e98d872bb 100644
--- a/mysql-test/t/empty_string_literal.test
+++ b/mysql-test/main/empty_string_literal.test
diff --git a/mysql-test/r/empty_table.result b/mysql-test/main/empty_table.result
index 2bca3e792fa..2bca3e792fa 100644
--- a/mysql-test/r/empty_table.result
+++ b/mysql-test/main/empty_table.result
diff --git a/mysql-test/t/empty_table.test b/mysql-test/main/empty_table.test
index 754671868ba..754671868ba 100644
--- a/mysql-test/t/empty_table.test
+++ b/mysql-test/main/empty_table.test
diff --git a/mysql-test/r/empty_user_table.result b/mysql-test/main/empty_user_table.result
index 54a7fd4907b..54a7fd4907b 100644
--- a/mysql-test/r/empty_user_table.result
+++ b/mysql-test/main/empty_user_table.result
diff --git a/mysql-test/t/empty_user_table.test b/mysql-test/main/empty_user_table.test
index b54f2109e30..b54f2109e30 100644
--- a/mysql-test/t/empty_user_table.test
+++ b/mysql-test/main/empty_user_table.test
diff --git a/mysql-test/r/endspace.result b/mysql-test/main/endspace.result
index f9619db7e64..f9619db7e64 100644
--- a/mysql-test/r/endspace.result
+++ b/mysql-test/main/endspace.result
diff --git a/mysql-test/t/endspace.test b/mysql-test/main/endspace.test
index 69b8133c5f7..69b8133c5f7 100644
--- a/mysql-test/t/endspace.test
+++ b/mysql-test/main/endspace.test
diff --git a/mysql-test/r/enforce_storage_engine.result b/mysql-test/main/enforce_storage_engine.result
index 296ed405a72..296ed405a72 100644
--- a/mysql-test/r/enforce_storage_engine.result
+++ b/mysql-test/main/enforce_storage_engine.result
diff --git a/mysql-test/t/enforce_storage_engine.test b/mysql-test/main/enforce_storage_engine.test
index 6b422477fe6..6b422477fe6 100644
--- a/mysql-test/t/enforce_storage_engine.test
+++ b/mysql-test/main/enforce_storage_engine.test
diff --git a/mysql-test/t/enforce_storage_engine_opt.opt b/mysql-test/main/enforce_storage_engine_opt.opt
index 9f09b57e395..9f09b57e395 100644
--- a/mysql-test/t/enforce_storage_engine_opt.opt
+++ b/mysql-test/main/enforce_storage_engine_opt.opt
diff --git a/mysql-test/r/enforce_storage_engine_opt.result b/mysql-test/main/enforce_storage_engine_opt.result
index 1b03aa281d9..1b03aa281d9 100644
--- a/mysql-test/r/enforce_storage_engine_opt.result
+++ b/mysql-test/main/enforce_storage_engine_opt.result
diff --git a/mysql-test/t/enforce_storage_engine_opt.test b/mysql-test/main/enforce_storage_engine_opt.test
index 7ca7f94d3dc..7ca7f94d3dc 100644
--- a/mysql-test/t/enforce_storage_engine_opt.test
+++ b/mysql-test/main/enforce_storage_engine_opt.test
diff --git a/mysql-test/r/engine_error_in_alter-8453.result b/mysql-test/main/engine_error_in_alter-8453.result
index c5a3375f33c..c5a3375f33c 100644
--- a/mysql-test/r/engine_error_in_alter-8453.result
+++ b/mysql-test/main/engine_error_in_alter-8453.result
diff --git a/mysql-test/t/engine_error_in_alter-8453.test b/mysql-test/main/engine_error_in_alter-8453.test
index c4600ec07fe..c4600ec07fe 100644
--- a/mysql-test/t/engine_error_in_alter-8453.test
+++ b/mysql-test/main/engine_error_in_alter-8453.test
diff --git a/mysql-test/t/error_simulation-master.opt b/mysql-test/main/error_simulation-master.opt
index c9f8d7bd0c0..c9f8d7bd0c0 100644
--- a/mysql-test/t/error_simulation-master.opt
+++ b/mysql-test/main/error_simulation-master.opt
diff --git a/mysql-test/r/error_simulation.result b/mysql-test/main/error_simulation.result
index e0ec26b2d1c..e0ec26b2d1c 100644
--- a/mysql-test/r/error_simulation.result
+++ b/mysql-test/main/error_simulation.result
diff --git a/mysql-test/t/error_simulation.test b/mysql-test/main/error_simulation.test
index beaaf603754..beaaf603754 100644
--- a/mysql-test/t/error_simulation.test
+++ b/mysql-test/main/error_simulation.test
diff --git a/mysql-test/r/errors.result b/mysql-test/main/errors.result
index ba05a2b37d4..ba05a2b37d4 100644
--- a/mysql-test/r/errors.result
+++ b/mysql-test/main/errors.result
diff --git a/mysql-test/t/errors.test b/mysql-test/main/errors.test
index 73d94d10382..73d94d10382 100644
--- a/mysql-test/t/errors.test
+++ b/mysql-test/main/errors.test
diff --git a/mysql-test/r/events_1.result b/mysql-test/main/events_1.result
index fc8d02e5e93..fc8d02e5e93 100644
--- a/mysql-test/r/events_1.result
+++ b/mysql-test/main/events_1.result
diff --git a/mysql-test/t/events_1.test b/mysql-test/main/events_1.test
index 9768127f458..9768127f458 100644
--- a/mysql-test/t/events_1.test
+++ b/mysql-test/main/events_1.test
diff --git a/mysql-test/r/events_2.result b/mysql-test/main/events_2.result
index 6d2ebda03d0..6d2ebda03d0 100644
--- a/mysql-test/r/events_2.result
+++ b/mysql-test/main/events_2.result
diff --git a/mysql-test/t/events_2.test b/mysql-test/main/events_2.test
index 12ce9210b0a..12ce9210b0a 100644
--- a/mysql-test/t/events_2.test
+++ b/mysql-test/main/events_2.test
diff --git a/mysql-test/t/events_bugs-master.opt b/mysql-test/main/events_bugs-master.opt
index f93413a61e5..f93413a61e5 100644
--- a/mysql-test/t/events_bugs-master.opt
+++ b/mysql-test/main/events_bugs-master.opt
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/main/events_bugs.result
index b56912dea7e..b56912dea7e 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/main/events_bugs.result
diff --git a/mysql-test/t/events_bugs.test b/mysql-test/main/events_bugs.test
index 76288c8fbae..76288c8fbae 100644
--- a/mysql-test/t/events_bugs.test
+++ b/mysql-test/main/events_bugs.test
diff --git a/mysql-test/r/events_embedded.result b/mysql-test/main/events_embedded.result
index 1a02188f2df..1a02188f2df 100644
--- a/mysql-test/r/events_embedded.result
+++ b/mysql-test/main/events_embedded.result
diff --git a/mysql-test/t/events_embedded.test b/mysql-test/main/events_embedded.test
index 9922ea6dfee..9922ea6dfee 100644
--- a/mysql-test/t/events_embedded.test
+++ b/mysql-test/main/events_embedded.test
diff --git a/mysql-test/r/events_grant.result b/mysql-test/main/events_grant.result
index 51b80742737..51b80742737 100644
--- a/mysql-test/r/events_grant.result
+++ b/mysql-test/main/events_grant.result
diff --git a/mysql-test/t/events_grant.test b/mysql-test/main/events_grant.test
index 8db4333cc03..8db4333cc03 100644
--- a/mysql-test/t/events_grant.test
+++ b/mysql-test/main/events_grant.test
diff --git a/mysql-test/t/events_logs_tests-master.opt b/mysql-test/main/events_logs_tests-master.opt
index 73d26b7260d..73d26b7260d 100644
--- a/mysql-test/t/events_logs_tests-master.opt
+++ b/mysql-test/main/events_logs_tests-master.opt
diff --git a/mysql-test/r/events_logs_tests.result b/mysql-test/main/events_logs_tests.result
index 9cc6e44511c..9cc6e44511c 100644
--- a/mysql-test/r/events_logs_tests.result
+++ b/mysql-test/main/events_logs_tests.result
diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/main/events_logs_tests.test
index c3bbff90723..c3bbff90723 100644
--- a/mysql-test/t/events_logs_tests.test
+++ b/mysql-test/main/events_logs_tests.test
diff --git a/mysql-test/r/events_microsec.result b/mysql-test/main/events_microsec.result
index 2a9f3587706..2a9f3587706 100644
--- a/mysql-test/r/events_microsec.result
+++ b/mysql-test/main/events_microsec.result
diff --git a/mysql-test/t/events_microsec.test b/mysql-test/main/events_microsec.test
index 3e9abf6ec56..3e9abf6ec56 100644
--- a/mysql-test/t/events_microsec.test
+++ b/mysql-test/main/events_microsec.test
diff --git a/mysql-test/t/events_restart-master.opt b/mysql-test/main/events_restart-master.opt
index f93413a61e5..f93413a61e5 100644
--- a/mysql-test/t/events_restart-master.opt
+++ b/mysql-test/main/events_restart-master.opt
diff --git a/mysql-test/r/events_restart.result b/mysql-test/main/events_restart.result
index 0caac907f64..0caac907f64 100644
--- a/mysql-test/r/events_restart.result
+++ b/mysql-test/main/events_restart.result
diff --git a/mysql-test/t/events_restart.test b/mysql-test/main/events_restart.test
index 7f01859e059..7f01859e059 100644
--- a/mysql-test/t/events_restart.test
+++ b/mysql-test/main/events_restart.test
diff --git a/mysql-test/r/events_scheduling.result b/mysql-test/main/events_scheduling.result
index 262caea3d7f..262caea3d7f 100644
--- a/mysql-test/r/events_scheduling.result
+++ b/mysql-test/main/events_scheduling.result
diff --git a/mysql-test/t/events_scheduling.test b/mysql-test/main/events_scheduling.test
index 5f16f8bea6a..5f16f8bea6a 100644
--- a/mysql-test/t/events_scheduling.test
+++ b/mysql-test/main/events_scheduling.test
diff --git a/mysql-test/r/events_slowlog.result b/mysql-test/main/events_slowlog.result
index be0a1e78d2a..be0a1e78d2a 100644
--- a/mysql-test/r/events_slowlog.result
+++ b/mysql-test/main/events_slowlog.result
diff --git a/mysql-test/t/events_slowlog.test b/mysql-test/main/events_slowlog.test
index 9679714dba3..9679714dba3 100644
--- a/mysql-test/t/events_slowlog.test
+++ b/mysql-test/main/events_slowlog.test
diff --git a/mysql-test/r/events_stress.result b/mysql-test/main/events_stress.result
index 1a91ff0f528..1a91ff0f528 100644
--- a/mysql-test/r/events_stress.result
+++ b/mysql-test/main/events_stress.result
diff --git a/mysql-test/t/events_stress.test b/mysql-test/main/events_stress.test
index 8ea7633877b..8ea7633877b 100644
--- a/mysql-test/t/events_stress.test
+++ b/mysql-test/main/events_stress.test
diff --git a/mysql-test/r/events_time_zone.result b/mysql-test/main/events_time_zone.result
index 155a9d155af..155a9d155af 100644
--- a/mysql-test/r/events_time_zone.result
+++ b/mysql-test/main/events_time_zone.result
diff --git a/mysql-test/t/events_time_zone.test b/mysql-test/main/events_time_zone.test
index 5291eb96e6b..5291eb96e6b 100644
--- a/mysql-test/t/events_time_zone.test
+++ b/mysql-test/main/events_time_zone.test
diff --git a/mysql-test/r/events_trans.result b/mysql-test/main/events_trans.result
index 873f0441089..873f0441089 100644
--- a/mysql-test/r/events_trans.result
+++ b/mysql-test/main/events_trans.result
diff --git a/mysql-test/t/events_trans.test b/mysql-test/main/events_trans.test
index eea24f19577..eea24f19577 100644
--- a/mysql-test/t/events_trans.test
+++ b/mysql-test/main/events_trans.test
diff --git a/mysql-test/r/events_trans_notembedded.result b/mysql-test/main/events_trans_notembedded.result
index 324e28ddb62..324e28ddb62 100644
--- a/mysql-test/r/events_trans_notembedded.result
+++ b/mysql-test/main/events_trans_notembedded.result
diff --git a/mysql-test/t/events_trans_notembedded.test b/mysql-test/main/events_trans_notembedded.test
index 3cf823bf713..3cf823bf713 100644
--- a/mysql-test/t/events_trans_notembedded.test
+++ b/mysql-test/main/events_trans_notembedded.test
diff --git a/mysql-test/r/except.result b/mysql-test/main/except.result
index 594bb7118eb..594bb7118eb 100644
--- a/mysql-test/r/except.result
+++ b/mysql-test/main/except.result
diff --git a/mysql-test/t/except.test b/mysql-test/main/except.test
index f88d9b29e35..f88d9b29e35 100644
--- a/mysql-test/t/except.test
+++ b/mysql-test/main/except.test
diff --git a/mysql-test/r/execution_constants.result b/mysql-test/main/execution_constants.result
index 86eed447b83..86eed447b83 100644
--- a/mysql-test/r/execution_constants.result
+++ b/mysql-test/main/execution_constants.result
diff --git a/mysql-test/t/execution_constants.test b/mysql-test/main/execution_constants.test
index 285197cd1f4..285197cd1f4 100644
--- a/mysql-test/t/execution_constants.test
+++ b/mysql-test/main/execution_constants.test
diff --git a/mysql-test/r/explain.result b/mysql-test/main/explain.result
index f593e0dfaba..f593e0dfaba 100644
--- a/mysql-test/r/explain.result
+++ b/mysql-test/main/explain.result
diff --git a/mysql-test/t/explain.test b/mysql-test/main/explain.test
index d5be354c852..d5be354c852 100644
--- a/mysql-test/t/explain.test
+++ b/mysql-test/main/explain.test
diff --git a/mysql-test/r/explain_json.result b/mysql-test/main/explain_json.result
index ef6b70aff71..ef6b70aff71 100644
--- a/mysql-test/r/explain_json.result
+++ b/mysql-test/main/explain_json.result
diff --git a/mysql-test/t/explain_json.test b/mysql-test/main/explain_json.test
index c3665b1818b..c3665b1818b 100644
--- a/mysql-test/t/explain_json.test
+++ b/mysql-test/main/explain_json.test
diff --git a/mysql-test/r/explain_json_format_partitions.result b/mysql-test/main/explain_json_format_partitions.result
index 5d7fdbc4864..5d7fdbc4864 100644
--- a/mysql-test/r/explain_json_format_partitions.result
+++ b/mysql-test/main/explain_json_format_partitions.result
diff --git a/mysql-test/t/explain_json_format_partitions.test b/mysql-test/main/explain_json_format_partitions.test
index 4c7d3f165d1..4c7d3f165d1 100644
--- a/mysql-test/t/explain_json_format_partitions.test
+++ b/mysql-test/main/explain_json_format_partitions.test
diff --git a/mysql-test/r/explain_json_innodb.result b/mysql-test/main/explain_json_innodb.result
index 8cec65642b4..8cec65642b4 100644
--- a/mysql-test/r/explain_json_innodb.result
+++ b/mysql-test/main/explain_json_innodb.result
diff --git a/mysql-test/t/explain_json_innodb.test b/mysql-test/main/explain_json_innodb.test
index f70df5d5349..f70df5d5349 100644
--- a/mysql-test/t/explain_json_innodb.test
+++ b/mysql-test/main/explain_json_innodb.test
diff --git a/mysql-test/r/explain_non_select.result b/mysql-test/main/explain_non_select.result
index 5a6b9f841c2..5a6b9f841c2 100644
--- a/mysql-test/r/explain_non_select.result
+++ b/mysql-test/main/explain_non_select.result
diff --git a/mysql-test/t/explain_non_select.test b/mysql-test/main/explain_non_select.test
index d9ff0fb7245..d9ff0fb7245 100644
--- a/mysql-test/t/explain_non_select.test
+++ b/mysql-test/main/explain_non_select.test
diff --git a/mysql-test/t/explain_slowquerylog-master.opt b/mysql-test/main/explain_slowquerylog-master.opt
index 0a3ad969e79..0a3ad969e79 100644
--- a/mysql-test/t/explain_slowquerylog-master.opt
+++ b/mysql-test/main/explain_slowquerylog-master.opt
diff --git a/mysql-test/r/explain_slowquerylog.result b/mysql-test/main/explain_slowquerylog.result
index 2b350cf04ff..2b350cf04ff 100644
--- a/mysql-test/r/explain_slowquerylog.result
+++ b/mysql-test/main/explain_slowquerylog.result
diff --git a/mysql-test/t/explain_slowquerylog.test b/mysql-test/main/explain_slowquerylog.test
index 6503a326eb8..6503a326eb8 100644
--- a/mysql-test/t/explain_slowquerylog.test
+++ b/mysql-test/main/explain_slowquerylog.test
diff --git a/mysql-test/r/ext_key_noPK_6794.result b/mysql-test/main/ext_key_noPK_6794.result
index 59344522887..59344522887 100644
--- a/mysql-test/r/ext_key_noPK_6794.result
+++ b/mysql-test/main/ext_key_noPK_6794.result
diff --git a/mysql-test/t/ext_key_noPK_6794.test b/mysql-test/main/ext_key_noPK_6794.test
index fc8a2724c22..fc8a2724c22 100644
--- a/mysql-test/t/ext_key_noPK_6794.test
+++ b/mysql-test/main/ext_key_noPK_6794.test
diff --git a/mysql-test/r/failed_auth_3909.result b/mysql-test/main/failed_auth_3909.result
index d0fd2c41221..d0fd2c41221 100644
--- a/mysql-test/r/failed_auth_3909.result
+++ b/mysql-test/main/failed_auth_3909.result
diff --git a/mysql-test/t/failed_auth_3909.test b/mysql-test/main/failed_auth_3909.test
index f72460691ea..f72460691ea 100644
--- a/mysql-test/t/failed_auth_3909.test
+++ b/mysql-test/main/failed_auth_3909.test
diff --git a/mysql-test/r/failed_auth_unixsocket.result b/mysql-test/main/failed_auth_unixsocket.result
index 680d3b48a33..680d3b48a33 100644
--- a/mysql-test/r/failed_auth_unixsocket.result
+++ b/mysql-test/main/failed_auth_unixsocket.result
diff --git a/mysql-test/t/failed_auth_unixsocket.test b/mysql-test/main/failed_auth_unixsocket.test
index f7345f44698..f7345f44698 100644
--- a/mysql-test/t/failed_auth_unixsocket.test
+++ b/mysql-test/main/failed_auth_unixsocket.test
diff --git a/mysql-test/r/fast_prefix_index_fetch_innodb.result b/mysql-test/main/fast_prefix_index_fetch_innodb.result
index c6d96389b08..c6d96389b08 100644
--- a/mysql-test/r/fast_prefix_index_fetch_innodb.result
+++ b/mysql-test/main/fast_prefix_index_fetch_innodb.result
diff --git a/mysql-test/t/fast_prefix_index_fetch_innodb.test b/mysql-test/main/fast_prefix_index_fetch_innodb.test
index c3b3440d82d..c3b3440d82d 100644
--- a/mysql-test/t/fast_prefix_index_fetch_innodb.test
+++ b/mysql-test/main/fast_prefix_index_fetch_innodb.test
diff --git a/mysql-test/r/features.result b/mysql-test/main/features.result
index fc276e2f885..fc276e2f885 100644
--- a/mysql-test/r/features.result
+++ b/mysql-test/main/features.result
diff --git a/mysql-test/t/features.test b/mysql-test/main/features.test
index 1241bd50bdd..1241bd50bdd 100644
--- a/mysql-test/t/features.test
+++ b/mysql-test/main/features.test
diff --git a/mysql-test/r/file_contents.result b/mysql-test/main/file_contents.result
index 2b5e6e6229b..2b5e6e6229b 100644
--- a/mysql-test/r/file_contents.result
+++ b/mysql-test/main/file_contents.result
diff --git a/mysql-test/t/file_contents.test b/mysql-test/main/file_contents.test
index 4734a0294f0..4734a0294f0 100644
--- a/mysql-test/t/file_contents.test
+++ b/mysql-test/main/file_contents.test
diff --git a/mysql-test/r/filesort_bad_i_s-7585.result b/mysql-test/main/filesort_bad_i_s-7585.result
index edb1574288f..edb1574288f 100644
--- a/mysql-test/r/filesort_bad_i_s-7585.result
+++ b/mysql-test/main/filesort_bad_i_s-7585.result
diff --git a/mysql-test/t/filesort_bad_i_s-7585.test b/mysql-test/main/filesort_bad_i_s-7585.test
index daf70acdd52..daf70acdd52 100644
--- a/mysql-test/t/filesort_bad_i_s-7585.test
+++ b/mysql-test/main/filesort_bad_i_s-7585.test
diff --git a/mysql-test/r/filesort_debug.result b/mysql-test/main/filesort_debug.result
index 4aa40592be7..4aa40592be7 100644
--- a/mysql-test/r/filesort_debug.result
+++ b/mysql-test/main/filesort_debug.result
diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/main/filesort_debug.test
index a8833617c09..a8833617c09 100644
--- a/mysql-test/t/filesort_debug.test
+++ b/mysql-test/main/filesort_debug.test
diff --git a/mysql-test/r/fix_priv_tables.result b/mysql-test/main/fix_priv_tables.result
index dea1ccdbd18..dea1ccdbd18 100644
--- a/mysql-test/r/fix_priv_tables.result
+++ b/mysql-test/main/fix_priv_tables.result
diff --git a/mysql-test/t/fix_priv_tables.test b/mysql-test/main/fix_priv_tables.test
index 293d3915a05..293d3915a05 100644
--- a/mysql-test/t/fix_priv_tables.test
+++ b/mysql-test/main/fix_priv_tables.test
diff --git a/mysql-test/r/flush-innodb-notembedded.result b/mysql-test/main/flush-innodb-notembedded.result
index 0b63a7b3519..0b63a7b3519 100644
--- a/mysql-test/r/flush-innodb-notembedded.result
+++ b/mysql-test/main/flush-innodb-notembedded.result
diff --git a/mysql-test/t/flush-innodb-notembedded.test b/mysql-test/main/flush-innodb-notembedded.test
index 1f73ba50fc4..1f73ba50fc4 100644
--- a/mysql-test/t/flush-innodb-notembedded.test
+++ b/mysql-test/main/flush-innodb-notembedded.test
diff --git a/mysql-test/r/flush-innodb.result b/mysql-test/main/flush-innodb.result
index 21e5bda7785..21e5bda7785 100644
--- a/mysql-test/r/flush-innodb.result
+++ b/mysql-test/main/flush-innodb.result
diff --git a/mysql-test/t/flush-innodb.test b/mysql-test/main/flush-innodb.test
index bf7b79bb5a3..bf7b79bb5a3 100644
--- a/mysql-test/t/flush-innodb.test
+++ b/mysql-test/main/flush-innodb.test
diff --git a/mysql-test/r/flush.result b/mysql-test/main/flush.result
index 5cd4fde477d..5cd4fde477d 100644
--- a/mysql-test/r/flush.result
+++ b/mysql-test/main/flush.result
diff --git a/mysql-test/t/flush.test b/mysql-test/main/flush.test
index 81834b7de10..81834b7de10 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/main/flush.test
diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/main/flush2-master.opt
index 789275fa25e..789275fa25e 100644
--- a/mysql-test/t/flush2-master.opt
+++ b/mysql-test/main/flush2-master.opt
diff --git a/mysql-test/r/flush2.result b/mysql-test/main/flush2.result
index a66b0d5c688..a66b0d5c688 100644
--- a/mysql-test/r/flush2.result
+++ b/mysql-test/main/flush2.result
diff --git a/mysql-test/t/flush2.test b/mysql-test/main/flush2.test
index 496b57ccea4..496b57ccea4 100644
--- a/mysql-test/t/flush2.test
+++ b/mysql-test/main/flush2.test
diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/main/flush_block_commit.result
index e9684e5aa46..e9684e5aa46 100644
--- a/mysql-test/r/flush_block_commit.result
+++ b/mysql-test/main/flush_block_commit.result
diff --git a/mysql-test/t/flush_block_commit.test b/mysql-test/main/flush_block_commit.test
index 6a6120ce63f..6a6120ce63f 100644
--- a/mysql-test/t/flush_block_commit.test
+++ b/mysql-test/main/flush_block_commit.test
diff --git a/mysql-test/r/flush_block_commit_notembedded.result b/mysql-test/main/flush_block_commit_notembedded.result
index 7dd6410ac70..7dd6410ac70 100644
--- a/mysql-test/r/flush_block_commit_notembedded.result
+++ b/mysql-test/main/flush_block_commit_notembedded.result
diff --git a/mysql-test/t/flush_block_commit_notembedded.test b/mysql-test/main/flush_block_commit_notembedded.test
index 3d894c5f16c..3d894c5f16c 100644
--- a/mysql-test/t/flush_block_commit_notembedded.test
+++ b/mysql-test/main/flush_block_commit_notembedded.test
diff --git a/mysql-test/r/flush_read_lock.result b/mysql-test/main/flush_read_lock.result
index 55c31ae8d12..55c31ae8d12 100644
--- a/mysql-test/r/flush_read_lock.result
+++ b/mysql-test/main/flush_read_lock.result
diff --git a/mysql-test/t/flush_read_lock.test b/mysql-test/main/flush_read_lock.test
index 4a9752ae9f1..4a9752ae9f1 100644
--- a/mysql-test/t/flush_read_lock.test
+++ b/mysql-test/main/flush_read_lock.test
diff --git a/mysql-test/r/flush_read_lock_kill.result b/mysql-test/main/flush_read_lock_kill.result
index 05836b04524..05836b04524 100644
--- a/mysql-test/r/flush_read_lock_kill.result
+++ b/mysql-test/main/flush_read_lock_kill.result
diff --git a/mysql-test/t/flush_read_lock_kill.test b/mysql-test/main/flush_read_lock_kill.test
index d83e5b3f1df..d83e5b3f1df 100644
--- a/mysql-test/t/flush_read_lock_kill.test
+++ b/mysql-test/main/flush_read_lock_kill.test
diff --git a/mysql-test/r/flush_table.result b/mysql-test/main/flush_table.result
index c56d63bd849..c56d63bd849 100644
--- a/mysql-test/r/flush_table.result
+++ b/mysql-test/main/flush_table.result
diff --git a/mysql-test/t/flush_table.test b/mysql-test/main/flush_table.test
index e4fc1b0c39f..e4fc1b0c39f 100644
--- a/mysql-test/t/flush_table.test
+++ b/mysql-test/main/flush_table.test
diff --git a/mysql-test/r/foreign_key.result b/mysql-test/main/foreign_key.result
index a82151ddec0..a82151ddec0 100644
--- a/mysql-test/r/foreign_key.result
+++ b/mysql-test/main/foreign_key.result
diff --git a/mysql-test/t/foreign_key.test b/mysql-test/main/foreign_key.test
index 17c93332cb3..17c93332cb3 100644
--- a/mysql-test/t/foreign_key.test
+++ b/mysql-test/main/foreign_key.test
diff --git a/mysql-test/r/frm_bad_row_type-7333.result b/mysql-test/main/frm_bad_row_type-7333.result
index 48404b1ba97..48404b1ba97 100644
--- a/mysql-test/r/frm_bad_row_type-7333.result
+++ b/mysql-test/main/frm_bad_row_type-7333.result
diff --git a/mysql-test/t/frm_bad_row_type-7333.test b/mysql-test/main/frm_bad_row_type-7333.test
index 916550402c9..916550402c9 100644
--- a/mysql-test/t/frm_bad_row_type-7333.test
+++ b/mysql-test/main/frm_bad_row_type-7333.test
diff --git a/mysql-test/r/fulltext.result b/mysql-test/main/fulltext.result
index 308d1d7fcb9..308d1d7fcb9 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/main/fulltext.result
diff --git a/mysql-test/t/fulltext.test b/mysql-test/main/fulltext.test
index 2e53ce7f112..2e53ce7f112 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/main/fulltext.test
diff --git a/mysql-test/r/fulltext2.result b/mysql-test/main/fulltext2.result
index 7e3e25370d3..7e3e25370d3 100644
--- a/mysql-test/r/fulltext2.result
+++ b/mysql-test/main/fulltext2.result
diff --git a/mysql-test/t/fulltext2.test b/mysql-test/main/fulltext2.test
index 78c7c859e95..78c7c859e95 100644
--- a/mysql-test/t/fulltext2.test
+++ b/mysql-test/main/fulltext2.test
diff --git a/mysql-test/r/fulltext3.result b/mysql-test/main/fulltext3.result
index c0b871cd5a7..c0b871cd5a7 100644
--- a/mysql-test/r/fulltext3.result
+++ b/mysql-test/main/fulltext3.result
diff --git a/mysql-test/t/fulltext3.test b/mysql-test/main/fulltext3.test
index 66f940b495e..66f940b495e 100644
--- a/mysql-test/t/fulltext3.test
+++ b/mysql-test/main/fulltext3.test
diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/main/fulltext_cache.result
index 80c101357c5..80c101357c5 100644
--- a/mysql-test/r/fulltext_cache.result
+++ b/mysql-test/main/fulltext_cache.result
diff --git a/mysql-test/t/fulltext_cache.test b/mysql-test/main/fulltext_cache.test
index ea05f699506..ea05f699506 100644
--- a/mysql-test/t/fulltext_cache.test
+++ b/mysql-test/main/fulltext_cache.test
diff --git a/mysql-test/r/fulltext_charsets.result b/mysql-test/main/fulltext_charsets.result
index 39ce02a3fce..39ce02a3fce 100644
--- a/mysql-test/r/fulltext_charsets.result
+++ b/mysql-test/main/fulltext_charsets.result
diff --git a/mysql-test/t/fulltext_charsets.test b/mysql-test/main/fulltext_charsets.test
index 3ac9791bd1a..3ac9791bd1a 100644
--- a/mysql-test/t/fulltext_charsets.test
+++ b/mysql-test/main/fulltext_charsets.test
diff --git a/mysql-test/r/fulltext_derived_4257.result b/mysql-test/main/fulltext_derived_4257.result
index 8479baef388..8479baef388 100644
--- a/mysql-test/r/fulltext_derived_4257.result
+++ b/mysql-test/main/fulltext_derived_4257.result
diff --git a/mysql-test/t/fulltext_derived_4257.test b/mysql-test/main/fulltext_derived_4257.test
index 07626b8b557..07626b8b557 100644
--- a/mysql-test/t/fulltext_derived_4257.test
+++ b/mysql-test/main/fulltext_derived_4257.test
diff --git a/mysql-test/r/fulltext_derived_4316.result b/mysql-test/main/fulltext_derived_4316.result
index 141202c9842..141202c9842 100644
--- a/mysql-test/r/fulltext_derived_4316.result
+++ b/mysql-test/main/fulltext_derived_4316.result
diff --git a/mysql-test/t/fulltext_derived_4316.test b/mysql-test/main/fulltext_derived_4316.test
index ecf4a0e7722..ecf4a0e7722 100644
--- a/mysql-test/t/fulltext_derived_4316.test
+++ b/mysql-test/main/fulltext_derived_4316.test
diff --git a/mysql-test/r/fulltext_distinct.result b/mysql-test/main/fulltext_distinct.result
index de0668ff28c..de0668ff28c 100644
--- a/mysql-test/r/fulltext_distinct.result
+++ b/mysql-test/main/fulltext_distinct.result
diff --git a/mysql-test/t/fulltext_distinct.test b/mysql-test/main/fulltext_distinct.test
index bf773c36844..bf773c36844 100644
--- a/mysql-test/t/fulltext_distinct.test
+++ b/mysql-test/main/fulltext_distinct.test
diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/main/fulltext_left_join.result
index d5373037538..d5373037538 100644
--- a/mysql-test/r/fulltext_left_join.result
+++ b/mysql-test/main/fulltext_left_join.result
diff --git a/mysql-test/t/fulltext_left_join.test b/mysql-test/main/fulltext_left_join.test
index 3a81c1a5d1b..3a81c1a5d1b 100644
--- a/mysql-test/t/fulltext_left_join.test
+++ b/mysql-test/main/fulltext_left_join.test
diff --git a/mysql-test/r/fulltext_multi.result b/mysql-test/main/fulltext_multi.result
index 289ee004395..289ee004395 100644
--- a/mysql-test/r/fulltext_multi.result
+++ b/mysql-test/main/fulltext_multi.result
diff --git a/mysql-test/t/fulltext_multi.test b/mysql-test/main/fulltext_multi.test
index fe64fe88599..fe64fe88599 100644
--- a/mysql-test/t/fulltext_multi.test
+++ b/mysql-test/main/fulltext_multi.test
diff --git a/mysql-test/r/fulltext_order_by.result b/mysql-test/main/fulltext_order_by.result
index c2f57c6f9c2..c2f57c6f9c2 100644
--- a/mysql-test/r/fulltext_order_by.result
+++ b/mysql-test/main/fulltext_order_by.result
diff --git a/mysql-test/t/fulltext_order_by.test b/mysql-test/main/fulltext_order_by.test
index 9fddf3b2fec..9fddf3b2fec 100644
--- a/mysql-test/t/fulltext_order_by.test
+++ b/mysql-test/main/fulltext_order_by.test
diff --git a/mysql-test/r/fulltext_update.result b/mysql-test/main/fulltext_update.result
index 5d3f95b318c..5d3f95b318c 100644
--- a/mysql-test/r/fulltext_update.result
+++ b/mysql-test/main/fulltext_update.result
diff --git a/mysql-test/t/fulltext_update.test b/mysql-test/main/fulltext_update.test
index 14eb0de58a5..14eb0de58a5 100644
--- a/mysql-test/t/fulltext_update.test
+++ b/mysql-test/main/fulltext_update.test
diff --git a/mysql-test/r/fulltext_var.result b/mysql-test/main/fulltext_var.result
index 50afea2a500..50afea2a500 100644
--- a/mysql-test/r/fulltext_var.result
+++ b/mysql-test/main/fulltext_var.result
diff --git a/mysql-test/t/fulltext_var.test b/mysql-test/main/fulltext_var.test
index a048dab7f40..a048dab7f40 100644
--- a/mysql-test/t/fulltext_var.test
+++ b/mysql-test/main/fulltext_var.test
diff --git a/mysql-test/r/func_analyse.result b/mysql-test/main/func_analyse.result
index 1e78e603bca..1e78e603bca 100644
--- a/mysql-test/r/func_analyse.result
+++ b/mysql-test/main/func_analyse.result
diff --git a/mysql-test/t/func_analyse.test b/mysql-test/main/func_analyse.test
index d99f5c0fa9a..d99f5c0fa9a 100644
--- a/mysql-test/t/func_analyse.test
+++ b/mysql-test/main/func_analyse.test
diff --git a/mysql-test/r/func_compress.result b/mysql-test/main/func_compress.result
index 60ddd866507..60ddd866507 100644
--- a/mysql-test/r/func_compress.result
+++ b/mysql-test/main/func_compress.result
diff --git a/mysql-test/t/func_compress.test b/mysql-test/main/func_compress.test
index 3fd9cad467b..3fd9cad467b 100644
--- a/mysql-test/t/func_compress.test
+++ b/mysql-test/main/func_compress.test
diff --git a/mysql-test/r/func_concat.result b/mysql-test/main/func_concat.result
index 9ab6f74653e..9ab6f74653e 100644
--- a/mysql-test/r/func_concat.result
+++ b/mysql-test/main/func_concat.result
diff --git a/mysql-test/t/func_concat.test b/mysql-test/main/func_concat.test
index 69dd2c4063e..69dd2c4063e 100644
--- a/mysql-test/t/func_concat.test
+++ b/mysql-test/main/func_concat.test
diff --git a/mysql-test/r/func_crypt.result b/mysql-test/main/func_crypt.result
index aaa6aa61eae..aaa6aa61eae 100644
--- a/mysql-test/r/func_crypt.result
+++ b/mysql-test/main/func_crypt.result
diff --git a/mysql-test/t/func_crypt.test b/mysql-test/main/func_crypt.test
index d091aa4ae86..d091aa4ae86 100644
--- a/mysql-test/t/func_crypt.test
+++ b/mysql-test/main/func_crypt.test
diff --git a/mysql-test/r/func_date_add.result b/mysql-test/main/func_date_add.result
index a6201a3c23f..a6201a3c23f 100644
--- a/mysql-test/r/func_date_add.result
+++ b/mysql-test/main/func_date_add.result
diff --git a/mysql-test/t/func_date_add.test b/mysql-test/main/func_date_add.test
index f9287b952d2..f9287b952d2 100644
--- a/mysql-test/t/func_date_add.test
+++ b/mysql-test/main/func_date_add.test
diff --git a/mysql-test/r/func_debug.result b/mysql-test/main/func_debug.result
index f1453344e0e..f1453344e0e 100644
--- a/mysql-test/r/func_debug.result
+++ b/mysql-test/main/func_debug.result
diff --git a/mysql-test/t/func_debug.test b/mysql-test/main/func_debug.test
index e0960f736cb..e0960f736cb 100644
--- a/mysql-test/t/func_debug.test
+++ b/mysql-test/main/func_debug.test
diff --git a/mysql-test/r/func_default.result b/mysql-test/main/func_default.result
index 535be10da86..535be10da86 100644
--- a/mysql-test/r/func_default.result
+++ b/mysql-test/main/func_default.result
diff --git a/mysql-test/t/func_default.test b/mysql-test/main/func_default.test
index fbd73990297..fbd73990297 100644
--- a/mysql-test/t/func_default.test
+++ b/mysql-test/main/func_default.test
diff --git a/mysql-test/r/func_des_encrypt.result b/mysql-test/main/func_des_encrypt.result
index b81f96f6ef7..b81f96f6ef7 100644
--- a/mysql-test/r/func_des_encrypt.result
+++ b/mysql-test/main/func_des_encrypt.result
diff --git a/mysql-test/t/func_des_encrypt.test b/mysql-test/main/func_des_encrypt.test
index c9661b81cc0..c9661b81cc0 100644
--- a/mysql-test/t/func_des_encrypt.test
+++ b/mysql-test/main/func_des_encrypt.test
diff --git a/mysql-test/r/func_digest.result b/mysql-test/main/func_digest.result
index 374d16ac687..374d16ac687 100644
--- a/mysql-test/r/func_digest.result
+++ b/mysql-test/main/func_digest.result
diff --git a/mysql-test/t/func_digest.test b/mysql-test/main/func_digest.test
index e7d73b4f368..e7d73b4f368 100644
--- a/mysql-test/t/func_digest.test
+++ b/mysql-test/main/func_digest.test
diff --git a/mysql-test/t/func_encrypt-master.opt b/mysql-test/main/func_encrypt-master.opt
index ab687810d5f..ab687810d5f 100644
--- a/mysql-test/t/func_encrypt-master.opt
+++ b/mysql-test/main/func_encrypt-master.opt
diff --git a/mysql-test/r/func_encrypt.result b/mysql-test/main/func_encrypt.result
index 68c44231e43..68c44231e43 100644
--- a/mysql-test/r/func_encrypt.result
+++ b/mysql-test/main/func_encrypt.result
diff --git a/mysql-test/t/func_encrypt.test b/mysql-test/main/func_encrypt.test
index e27a2bd46d3..e27a2bd46d3 100644
--- a/mysql-test/t/func_encrypt.test
+++ b/mysql-test/main/func_encrypt.test
diff --git a/mysql-test/r/func_encrypt_nossl.result b/mysql-test/main/func_encrypt_nossl.result
index dd45717a22f..dd45717a22f 100644
--- a/mysql-test/r/func_encrypt_nossl.result
+++ b/mysql-test/main/func_encrypt_nossl.result
diff --git a/mysql-test/t/func_encrypt_nossl.test b/mysql-test/main/func_encrypt_nossl.test
index 2dafaa671c4..2dafaa671c4 100644
--- a/mysql-test/t/func_encrypt_nossl.test
+++ b/mysql-test/main/func_encrypt_nossl.test
diff --git a/mysql-test/r/func_encrypt_ucs2.result b/mysql-test/main/func_encrypt_ucs2.result
index 5ab3b08fb5d..5ab3b08fb5d 100644
--- a/mysql-test/r/func_encrypt_ucs2.result
+++ b/mysql-test/main/func_encrypt_ucs2.result
diff --git a/mysql-test/t/func_encrypt_ucs2.test b/mysql-test/main/func_encrypt_ucs2.test
index 1242c3b9e6a..1242c3b9e6a 100644
--- a/mysql-test/t/func_encrypt_ucs2.test
+++ b/mysql-test/main/func_encrypt_ucs2.test
diff --git a/mysql-test/r/func_equal.result b/mysql-test/main/func_equal.result
index f20b259191c..f20b259191c 100644
--- a/mysql-test/r/func_equal.result
+++ b/mysql-test/main/func_equal.result
diff --git a/mysql-test/t/func_equal.test b/mysql-test/main/func_equal.test
index f17ebb5bd84..f17ebb5bd84 100644
--- a/mysql-test/t/func_equal.test
+++ b/mysql-test/main/func_equal.test
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/main/func_gconcat.result
index 723a1952d79..723a1952d79 100644
--- a/mysql-test/r/func_gconcat.result
+++ b/mysql-test/main/func_gconcat.result
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/main/func_gconcat.test
index 5cbc6969e02..5cbc6969e02 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/main/func_gconcat.test
diff --git a/mysql-test/r/func_group.result b/mysql-test/main/func_group.result
index 9f3928615ec..9f3928615ec 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/main/func_group.result
diff --git a/mysql-test/t/func_group.test b/mysql-test/main/func_group.test
index d847f7cd5f7..d847f7cd5f7 100644
--- a/mysql-test/t/func_group.test
+++ b/mysql-test/main/func_group.test
diff --git a/mysql-test/r/func_group_innodb.result b/mysql-test/main/func_group_innodb.result
index 27493ae710b..27493ae710b 100644
--- a/mysql-test/r/func_group_innodb.result
+++ b/mysql-test/main/func_group_innodb.result
diff --git a/mysql-test/t/func_group_innodb.test b/mysql-test/main/func_group_innodb.test
index 1d175f85ed9..1d175f85ed9 100644
--- a/mysql-test/t/func_group_innodb.test
+++ b/mysql-test/main/func_group_innodb.test
diff --git a/mysql-test/r/func_hybrid_type.result b/mysql-test/main/func_hybrid_type.result
index 1bf8231f4dd..1bf8231f4dd 100644
--- a/mysql-test/r/func_hybrid_type.result
+++ b/mysql-test/main/func_hybrid_type.result
diff --git a/mysql-test/t/func_hybrid_type.test b/mysql-test/main/func_hybrid_type.test
index 954c7de53fa..954c7de53fa 100644
--- a/mysql-test/t/func_hybrid_type.test
+++ b/mysql-test/main/func_hybrid_type.test
diff --git a/mysql-test/r/func_if.result b/mysql-test/main/func_if.result
index 09eb85d9fb6..09eb85d9fb6 100644
--- a/mysql-test/r/func_if.result
+++ b/mysql-test/main/func_if.result
diff --git a/mysql-test/t/func_if.test b/mysql-test/main/func_if.test
index dc6749da26f..dc6749da26f 100644
--- a/mysql-test/t/func_if.test
+++ b/mysql-test/main/func_if.test
diff --git a/mysql-test/r/func_in.result b/mysql-test/main/func_in.result
index 65313148bf8..65313148bf8 100644
--- a/mysql-test/r/func_in.result
+++ b/mysql-test/main/func_in.result
diff --git a/mysql-test/t/func_in.test b/mysql-test/main/func_in.test
index b99fad159c2..b99fad159c2 100644
--- a/mysql-test/t/func_in.test
+++ b/mysql-test/main/func_in.test
diff --git a/mysql-test/r/func_int.result b/mysql-test/main/func_int.result
index 05573858b17..05573858b17 100644
--- a/mysql-test/r/func_int.result
+++ b/mysql-test/main/func_int.result
diff --git a/mysql-test/t/func_int.test b/mysql-test/main/func_int.test
index 98794561933..98794561933 100644
--- a/mysql-test/t/func_int.test
+++ b/mysql-test/main/func_int.test
diff --git a/mysql-test/r/func_isnull.result b/mysql-test/main/func_isnull.result
index 15d87997e29..15d87997e29 100644
--- a/mysql-test/r/func_isnull.result
+++ b/mysql-test/main/func_isnull.result
diff --git a/mysql-test/t/func_isnull.test b/mysql-test/main/func_isnull.test
index 4c59fa3cbe8..4c59fa3cbe8 100644
--- a/mysql-test/t/func_isnull.test
+++ b/mysql-test/main/func_isnull.test
diff --git a/mysql-test/r/func_json.result b/mysql-test/main/func_json.result
index 9b41c1f9d61..9b41c1f9d61 100644
--- a/mysql-test/r/func_json.result
+++ b/mysql-test/main/func_json.result
diff --git a/mysql-test/t/func_json.test b/mysql-test/main/func_json.test
index 2669408fdce..2669408fdce 100644
--- a/mysql-test/t/func_json.test
+++ b/mysql-test/main/func_json.test
diff --git a/mysql-test/r/func_like.result b/mysql-test/main/func_like.result
index 0ba8e41f164..0ba8e41f164 100644
--- a/mysql-test/r/func_like.result
+++ b/mysql-test/main/func_like.result
diff --git a/mysql-test/t/func_like.test b/mysql-test/main/func_like.test
index 5026bb76aa3..5026bb76aa3 100644
--- a/mysql-test/t/func_like.test
+++ b/mysql-test/main/func_like.test
diff --git a/mysql-test/r/func_math.result b/mysql-test/main/func_math.result
index 7f2ed1c2ff0..7f2ed1c2ff0 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/main/func_math.result
diff --git a/mysql-test/t/func_math.test b/mysql-test/main/func_math.test
index 83e345ec890..83e345ec890 100644
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/main/func_math.test
diff --git a/mysql-test/r/func_misc.result b/mysql-test/main/func_misc.result
index 804a563f401..804a563f401 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/main/func_misc.result
diff --git a/mysql-test/t/func_misc.test b/mysql-test/main/func_misc.test
index 9f452e632ec..9f452e632ec 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/main/func_misc.test
diff --git a/mysql-test/r/func_op.result b/mysql-test/main/func_op.result
index 36fe8446638..36fe8446638 100644
--- a/mysql-test/r/func_op.result
+++ b/mysql-test/main/func_op.result
diff --git a/mysql-test/t/func_op.test b/mysql-test/main/func_op.test
index 13fa40b513b..13fa40b513b 100644
--- a/mysql-test/t/func_op.test
+++ b/mysql-test/main/func_op.test
diff --git a/mysql-test/r/func_regexp.result b/mysql-test/main/func_regexp.result
index 187df785f69..187df785f69 100644
--- a/mysql-test/r/func_regexp.result
+++ b/mysql-test/main/func_regexp.result
diff --git a/mysql-test/t/func_regexp.test b/mysql-test/main/func_regexp.test
index 6d5186269a5..6d5186269a5 100644
--- a/mysql-test/t/func_regexp.test
+++ b/mysql-test/main/func_regexp.test
diff --git a/mysql-test/r/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result
index e030df99756..e030df99756 100644
--- a/mysql-test/r/func_regexp_pcre.result
+++ b/mysql-test/main/func_regexp_pcre.result
diff --git a/mysql-test/t/func_regexp_pcre.test b/mysql-test/main/func_regexp_pcre.test
index 21600390bb2..21600390bb2 100644
--- a/mysql-test/t/func_regexp_pcre.test
+++ b/mysql-test/main/func_regexp_pcre.test
diff --git a/mysql-test/r/func_regexp_pcre_debug.result b/mysql-test/main/func_regexp_pcre_debug.result
index e44492fca72..e44492fca72 100644
--- a/mysql-test/r/func_regexp_pcre_debug.result
+++ b/mysql-test/main/func_regexp_pcre_debug.result
diff --git a/mysql-test/t/func_regexp_pcre_debug.test b/mysql-test/main/func_regexp_pcre_debug.test
index c2581fa4110..c2581fa4110 100644
--- a/mysql-test/t/func_regexp_pcre_debug.test
+++ b/mysql-test/main/func_regexp_pcre_debug.test
diff --git a/mysql-test/r/func_rollback.result b/mysql-test/main/func_rollback.result
index 91151302a06..91151302a06 100644
--- a/mysql-test/r/func_rollback.result
+++ b/mysql-test/main/func_rollback.result
diff --git a/mysql-test/t/func_rollback.test b/mysql-test/main/func_rollback.test
index 87930909f91..87930909f91 100644
--- a/mysql-test/t/func_rollback.test
+++ b/mysql-test/main/func_rollback.test
diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/main/func_sapdb.result
index 5b9743fb33f..5b9743fb33f 100644
--- a/mysql-test/r/func_sapdb.result
+++ b/mysql-test/main/func_sapdb.result
diff --git a/mysql-test/t/func_sapdb.test b/mysql-test/main/func_sapdb.test
index 51bdebbec6d..51bdebbec6d 100644
--- a/mysql-test/t/func_sapdb.test
+++ b/mysql-test/main/func_sapdb.test
diff --git a/mysql-test/r/func_set.result b/mysql-test/main/func_set.result
index 73e121f5f2b..73e121f5f2b 100644
--- a/mysql-test/r/func_set.result
+++ b/mysql-test/main/func_set.result
diff --git a/mysql-test/t/func_set.test b/mysql-test/main/func_set.test
index 3509e225a34..3509e225a34 100644
--- a/mysql-test/t/func_set.test
+++ b/mysql-test/main/func_set.test
diff --git a/mysql-test/r/func_str.result b/mysql-test/main/func_str.result
index 2b376373f51..2b376373f51 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/main/func_str.result
diff --git a/mysql-test/t/func_str.test b/mysql-test/main/func_str.test
index dbb7502a3ec..dbb7502a3ec 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/main/func_str.test
diff --git a/mysql-test/r/func_system.result b/mysql-test/main/func_system.result
index 06fb7e44cf0..06fb7e44cf0 100644
--- a/mysql-test/r/func_system.result
+++ b/mysql-test/main/func_system.result
diff --git a/mysql-test/t/func_system.test b/mysql-test/main/func_system.test
index fa09e81a300..fa09e81a300 100644
--- a/mysql-test/t/func_system.test
+++ b/mysql-test/main/func_system.test
diff --git a/mysql-test/r/func_test.result b/mysql-test/main/func_test.result
index 4243ed9cfb0..4243ed9cfb0 100644
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/main/func_test.result
diff --git a/mysql-test/t/func_test.test b/mysql-test/main/func_test.test
index d1c0702da80..d1c0702da80 100644
--- a/mysql-test/t/func_test.test
+++ b/mysql-test/main/func_test.test
diff --git a/mysql-test/r/func_time.result b/mysql-test/main/func_time.result
index 2772f850ce9..2772f850ce9 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/main/func_time.result
diff --git a/mysql-test/t/func_time.test b/mysql-test/main/func_time.test
index 5417cb20a92..5417cb20a92 100644
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/main/func_time.test
diff --git a/mysql-test/r/func_time_hires.result b/mysql-test/main/func_time_hires.result
index 0f822456724..0f822456724 100644
--- a/mysql-test/r/func_time_hires.result
+++ b/mysql-test/main/func_time_hires.result
diff --git a/mysql-test/t/func_time_hires.test b/mysql-test/main/func_time_hires.test
index 4dcd51a85ba..4dcd51a85ba 100644
--- a/mysql-test/t/func_time_hires.test
+++ b/mysql-test/main/func_time_hires.test
diff --git a/mysql-test/r/func_timestamp.result b/mysql-test/main/func_timestamp.result
index 18fcbd947e7..18fcbd947e7 100644
--- a/mysql-test/r/func_timestamp.result
+++ b/mysql-test/main/func_timestamp.result
diff --git a/mysql-test/t/func_timestamp.test b/mysql-test/main/func_timestamp.test
index 05a91b06d28..05a91b06d28 100644
--- a/mysql-test/t/func_timestamp.test
+++ b/mysql-test/main/func_timestamp.test
diff --git a/mysql-test/r/func_weight_string.result b/mysql-test/main/func_weight_string.result
index 5fa78c861a9..5fa78c861a9 100644
--- a/mysql-test/r/func_weight_string.result
+++ b/mysql-test/main/func_weight_string.result
diff --git a/mysql-test/t/func_weight_string.test b/mysql-test/main/func_weight_string.test
index b376b996556..b376b996556 100644
--- a/mysql-test/t/func_weight_string.test
+++ b/mysql-test/main/func_weight_string.test
diff --git a/mysql-test/r/function_defaults.result b/mysql-test/main/function_defaults.result
index 62422752e17..62422752e17 100644
--- a/mysql-test/r/function_defaults.result
+++ b/mysql-test/main/function_defaults.result
diff --git a/mysql-test/t/function_defaults.test b/mysql-test/main/function_defaults.test
index f8b23d0eda8..f8b23d0eda8 100644
--- a/mysql-test/t/function_defaults.test
+++ b/mysql-test/main/function_defaults.test
diff --git a/mysql-test/r/function_defaults_innodb.result b/mysql-test/main/function_defaults_innodb.result
index dd769f8577a..dd769f8577a 100644
--- a/mysql-test/r/function_defaults_innodb.result
+++ b/mysql-test/main/function_defaults_innodb.result
diff --git a/mysql-test/t/function_defaults_innodb.test b/mysql-test/main/function_defaults_innodb.test
index de5a6d34b73..de5a6d34b73 100644
--- a/mysql-test/t/function_defaults_innodb.test
+++ b/mysql-test/main/function_defaults_innodb.test
diff --git a/mysql-test/r/function_defaults_notembedded.result b/mysql-test/main/function_defaults_notembedded.result
index 645133bad1d..645133bad1d 100644
--- a/mysql-test/r/function_defaults_notembedded.result
+++ b/mysql-test/main/function_defaults_notembedded.result
diff --git a/mysql-test/t/function_defaults_notembedded.test b/mysql-test/main/function_defaults_notembedded.test
index 3d686c4b272..3d686c4b272 100644
--- a/mysql-test/t/function_defaults_notembedded.test
+++ b/mysql-test/main/function_defaults_notembedded.test
diff --git a/mysql-test/r/gcc296.result b/mysql-test/main/gcc296.result
index 628bbbf3f93..628bbbf3f93 100644
--- a/mysql-test/r/gcc296.result
+++ b/mysql-test/main/gcc296.result
diff --git a/mysql-test/t/gcc296.test b/mysql-test/main/gcc296.test
index bfcd56ff396..bfcd56ff396 100644
--- a/mysql-test/t/gcc296.test
+++ b/mysql-test/main/gcc296.test
diff --git a/mysql-test/r/get_diagnostics.result b/mysql-test/main/get_diagnostics.result
index 732be7c0283..732be7c0283 100644
--- a/mysql-test/r/get_diagnostics.result
+++ b/mysql-test/main/get_diagnostics.result
diff --git a/mysql-test/t/get_diagnostics.test b/mysql-test/main/get_diagnostics.test
index a30bad72136..a30bad72136 100644
--- a/mysql-test/t/get_diagnostics.test
+++ b/mysql-test/main/get_diagnostics.test
diff --git a/mysql-test/r/gis-alter_table_online.result b/mysql-test/main/gis-alter_table_online.result
index 80e40416c1e..80e40416c1e 100644
--- a/mysql-test/r/gis-alter_table_online.result
+++ b/mysql-test/main/gis-alter_table_online.result
diff --git a/mysql-test/t/gis-alter_table_online.test b/mysql-test/main/gis-alter_table_online.test
index be6d2137e77..be6d2137e77 100644
--- a/mysql-test/t/gis-alter_table_online.test
+++ b/mysql-test/main/gis-alter_table_online.test
diff --git a/mysql-test/r/gis-debug.result b/mysql-test/main/gis-debug.result
index be4145f2236..be4145f2236 100644
--- a/mysql-test/r/gis-debug.result
+++ b/mysql-test/main/gis-debug.result
diff --git a/mysql-test/t/gis-debug.test b/mysql-test/main/gis-debug.test
index 588bc706370..588bc706370 100644
--- a/mysql-test/t/gis-debug.test
+++ b/mysql-test/main/gis-debug.test
diff --git a/mysql-test/r/gis-json.result b/mysql-test/main/gis-json.result
index 1d6e2193fc9..1d6e2193fc9 100644
--- a/mysql-test/r/gis-json.result
+++ b/mysql-test/main/gis-json.result
diff --git a/mysql-test/t/gis-json.test b/mysql-test/main/gis-json.test
index b91ef235fd0..b91ef235fd0 100644
--- a/mysql-test/t/gis-json.test
+++ b/mysql-test/main/gis-json.test
diff --git a/mysql-test/r/gis-loaddata.result b/mysql-test/main/gis-loaddata.result
index 1d25c0a496d..1d25c0a496d 100644
--- a/mysql-test/r/gis-loaddata.result
+++ b/mysql-test/main/gis-loaddata.result
diff --git a/mysql-test/t/gis-loaddata.test b/mysql-test/main/gis-loaddata.test
index ad6a2c56b08..ad6a2c56b08 100644
--- a/mysql-test/t/gis-loaddata.test
+++ b/mysql-test/main/gis-loaddata.test
diff --git a/mysql-test/r/gis-precise.result b/mysql-test/main/gis-precise.result
index 292dfe0462c..292dfe0462c 100644
--- a/mysql-test/r/gis-precise.result
+++ b/mysql-test/main/gis-precise.result
diff --git a/mysql-test/t/gis-precise.test b/mysql-test/main/gis-precise.test
index 07fabae6025..07fabae6025 100644
--- a/mysql-test/t/gis-precise.test
+++ b/mysql-test/main/gis-precise.test
diff --git a/mysql-test/r/gis-rt-precise.result b/mysql-test/main/gis-rt-precise.result
index d3308ed90ba..d3308ed90ba 100644
--- a/mysql-test/r/gis-rt-precise.result
+++ b/mysql-test/main/gis-rt-precise.result
diff --git a/mysql-test/t/gis-rt-precise.test b/mysql-test/main/gis-rt-precise.test
index 9c26aa05598..9c26aa05598 100644
--- a/mysql-test/t/gis-rt-precise.test
+++ b/mysql-test/main/gis-rt-precise.test
diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/main/gis-rtree.result
index 5d4708dd111..5d4708dd111 100644
--- a/mysql-test/r/gis-rtree.result
+++ b/mysql-test/main/gis-rtree.result
diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/main/gis-rtree.test
index 41388090427..41388090427 100644
--- a/mysql-test/t/gis-rtree.test
+++ b/mysql-test/main/gis-rtree.test
diff --git a/mysql-test/r/gis.result b/mysql-test/main/gis.result
index 3f2e6d39db8..3f2e6d39db8 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/main/gis.result
diff --git a/mysql-test/t/gis.test b/mysql-test/main/gis.test
index ca806778f0e..ca806778f0e 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/main/gis.test
diff --git a/mysql-test/r/gis2.result b/mysql-test/main/gis2.result
index c0b476e080b..c0b476e080b 100644
--- a/mysql-test/r/gis2.result
+++ b/mysql-test/main/gis2.result
diff --git a/mysql-test/t/gis2.test b/mysql-test/main/gis2.test
index 9731e2a91d0..9731e2a91d0 100644
--- a/mysql-test/t/gis2.test
+++ b/mysql-test/main/gis2.test
diff --git a/mysql-test/r/grant.result b/mysql-test/main/grant.result
index 22add627144..22add627144 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/main/grant.result
diff --git a/mysql-test/t/grant.test b/mysql-test/main/grant.test
index c945e818181..c945e818181 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/main/grant.test
diff --git a/mysql-test/r/grant2.result b/mysql-test/main/grant2.result
index 2ccc01d225a..2ccc01d225a 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/main/grant2.result
diff --git a/mysql-test/t/grant2.test b/mysql-test/main/grant2.test
index 5e8a130feea..5e8a130feea 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/main/grant2.test
diff --git a/mysql-test/t/grant3-master.opt b/mysql-test/main/grant3-master.opt
index 4b11f5902c1..4b11f5902c1 100644
--- a/mysql-test/t/grant3-master.opt
+++ b/mysql-test/main/grant3-master.opt
diff --git a/mysql-test/r/grant3.result b/mysql-test/main/grant3.result
index 4c99fb02f19..4c99fb02f19 100644
--- a/mysql-test/r/grant3.result
+++ b/mysql-test/main/grant3.result
diff --git a/mysql-test/t/grant3.test b/mysql-test/main/grant3.test
index 27f565916f7..27f565916f7 100644
--- a/mysql-test/t/grant3.test
+++ b/mysql-test/main/grant3.test
diff --git a/mysql-test/r/grant4.result b/mysql-test/main/grant4.result
index c3db2e03e3e..c3db2e03e3e 100644
--- a/mysql-test/r/grant4.result
+++ b/mysql-test/main/grant4.result
diff --git a/mysql-test/t/grant4.test b/mysql-test/main/grant4.test
index 2715b7c7145..2715b7c7145 100644
--- a/mysql-test/t/grant4.test
+++ b/mysql-test/main/grant4.test
diff --git a/mysql-test/r/grant5.result b/mysql-test/main/grant5.result
index 24abc61a348..24abc61a348 100644
--- a/mysql-test/r/grant5.result
+++ b/mysql-test/main/grant5.result
diff --git a/mysql-test/t/grant5.test b/mysql-test/main/grant5.test
index 14f2fd65020..14f2fd65020 100644
--- a/mysql-test/t/grant5.test
+++ b/mysql-test/main/grant5.test
diff --git a/mysql-test/r/grant_4332.result b/mysql-test/main/grant_4332.result
index b62ca1a20cc..b62ca1a20cc 100644
--- a/mysql-test/r/grant_4332.result
+++ b/mysql-test/main/grant_4332.result
diff --git a/mysql-test/t/grant_4332.test b/mysql-test/main/grant_4332.test
index 41e0b822f98..41e0b822f98 100644
--- a/mysql-test/t/grant_4332.test
+++ b/mysql-test/main/grant_4332.test
diff --git a/mysql-test/r/grant_cache_no_prot.result b/mysql-test/main/grant_cache_no_prot.result
index f1adb3ae839..f1adb3ae839 100644
--- a/mysql-test/r/grant_cache_no_prot.result
+++ b/mysql-test/main/grant_cache_no_prot.result
diff --git a/mysql-test/t/grant_cache_no_prot.test b/mysql-test/main/grant_cache_no_prot.test
index 31209f343b9..31209f343b9 100644
--- a/mysql-test/t/grant_cache_no_prot.test
+++ b/mysql-test/main/grant_cache_no_prot.test
diff --git a/mysql-test/r/grant_cache_ps_prot.result b/mysql-test/main/grant_cache_ps_prot.result
index 56a98cc076d..56a98cc076d 100644
--- a/mysql-test/r/grant_cache_ps_prot.result
+++ b/mysql-test/main/grant_cache_ps_prot.result
diff --git a/mysql-test/t/grant_cache_ps_prot.test b/mysql-test/main/grant_cache_ps_prot.test
index 27b3f23de3f..27b3f23de3f 100644
--- a/mysql-test/t/grant_cache_ps_prot.test
+++ b/mysql-test/main/grant_cache_ps_prot.test
diff --git a/mysql-test/r/grant_explain_non_select.result b/mysql-test/main/grant_explain_non_select.result
index 53b7d687d6c..53b7d687d6c 100644
--- a/mysql-test/r/grant_explain_non_select.result
+++ b/mysql-test/main/grant_explain_non_select.result
diff --git a/mysql-test/t/grant_explain_non_select.test b/mysql-test/main/grant_explain_non_select.test
index 701586be325..701586be325 100644
--- a/mysql-test/t/grant_explain_non_select.test
+++ b/mysql-test/main/grant_explain_non_select.test
diff --git a/mysql-test/t/grant_lowercase.opt b/mysql-test/main/grant_lowercase.opt
index 5b0a3d41b41..5b0a3d41b41 100644
--- a/mysql-test/t/grant_lowercase.opt
+++ b/mysql-test/main/grant_lowercase.opt
diff --git a/mysql-test/r/grant_lowercase.result b/mysql-test/main/grant_lowercase.result
index d4a1667595e..d4a1667595e 100644
--- a/mysql-test/r/grant_lowercase.result
+++ b/mysql-test/main/grant_lowercase.result
diff --git a/mysql-test/t/grant_lowercase.test b/mysql-test/main/grant_lowercase.test
index e31a72b890e..e31a72b890e 100644
--- a/mysql-test/t/grant_lowercase.test
+++ b/mysql-test/main/grant_lowercase.test
diff --git a/mysql-test/r/grant_lowercase_fs.result b/mysql-test/main/grant_lowercase_fs.result
index e883067eca0..e883067eca0 100644
--- a/mysql-test/r/grant_lowercase_fs.result
+++ b/mysql-test/main/grant_lowercase_fs.result
diff --git a/mysql-test/t/grant_lowercase_fs.test b/mysql-test/main/grant_lowercase_fs.test
index 92191829c58..92191829c58 100644
--- a/mysql-test/t/grant_lowercase_fs.test
+++ b/mysql-test/main/grant_lowercase_fs.test
diff --git a/mysql-test/r/greedy_optimizer.result b/mysql-test/main/greedy_optimizer.result
index de9db45cb15..de9db45cb15 100644
--- a/mysql-test/r/greedy_optimizer.result
+++ b/mysql-test/main/greedy_optimizer.result
diff --git a/mysql-test/t/greedy_optimizer.test b/mysql-test/main/greedy_optimizer.test
index dcd0587d76e..dcd0587d76e 100644
--- a/mysql-test/t/greedy_optimizer.test
+++ b/mysql-test/main/greedy_optimizer.test
diff --git a/mysql-test/r/group_by.result b/mysql-test/main/group_by.result
index 62c659dd933..62c659dd933 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/main/group_by.result
diff --git a/mysql-test/t/group_by.test b/mysql-test/main/group_by.test
index 275939df5c5..275939df5c5 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/main/group_by.test
diff --git a/mysql-test/r/group_by_innodb.result b/mysql-test/main/group_by_innodb.result
index 034866b63d5..034866b63d5 100644
--- a/mysql-test/r/group_by_innodb.result
+++ b/mysql-test/main/group_by_innodb.result
diff --git a/mysql-test/t/group_by_innodb.test b/mysql-test/main/group_by_innodb.test
index f7e035a1b54..f7e035a1b54 100644
--- a/mysql-test/t/group_by_innodb.test
+++ b/mysql-test/main/group_by_innodb.test
diff --git a/mysql-test/r/group_by_null.result b/mysql-test/main/group_by_null.result
index 1ae090fdc63..1ae090fdc63 100644
--- a/mysql-test/r/group_by_null.result
+++ b/mysql-test/main/group_by_null.result
diff --git a/mysql-test/t/group_by_null.test b/mysql-test/main/group_by_null.test
index 93e965671dd..93e965671dd 100644
--- a/mysql-test/t/group_by_null.test
+++ b/mysql-test/main/group_by_null.test
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/main/group_min_max.result
index 36a44b05817..36a44b05817 100644
--- a/mysql-test/r/group_min_max.result
+++ b/mysql-test/main/group_min_max.result
diff --git a/mysql-test/t/group_min_max.test b/mysql-test/main/group_min_max.test
index b0bc42d7f8c..b0bc42d7f8c 100644
--- a/mysql-test/t/group_min_max.test
+++ b/mysql-test/main/group_min_max.test
diff --git a/mysql-test/r/group_min_max_innodb.result b/mysql-test/main/group_min_max_innodb.result
index 311032bc453..311032bc453 100644
--- a/mysql-test/r/group_min_max_innodb.result
+++ b/mysql-test/main/group_min_max_innodb.result
diff --git a/mysql-test/t/group_min_max_innodb.test b/mysql-test/main/group_min_max_innodb.test
index 91e0bd3279f..91e0bd3279f 100644
--- a/mysql-test/t/group_min_max_innodb.test
+++ b/mysql-test/main/group_min_max_innodb.test
diff --git a/mysql-test/r/handler_read_last.result b/mysql-test/main/handler_read_last.result
index 9dd3784673a..9dd3784673a 100644
--- a/mysql-test/r/handler_read_last.result
+++ b/mysql-test/main/handler_read_last.result
diff --git a/mysql-test/t/handler_read_last.test b/mysql-test/main/handler_read_last.test
index 9104be78952..9104be78952 100644
--- a/mysql-test/t/handler_read_last.test
+++ b/mysql-test/main/handler_read_last.test
diff --git a/mysql-test/r/handlersocket.result b/mysql-test/main/handlersocket.result
index 1b3fc573548..1b3fc573548 100644
--- a/mysql-test/r/handlersocket.result
+++ b/mysql-test/main/handlersocket.result
diff --git a/mysql-test/t/handlersocket.test b/mysql-test/main/handlersocket.test
index 10cb9728fb7..10cb9728fb7 100644
--- a/mysql-test/t/handlersocket.test
+++ b/mysql-test/main/handlersocket.test
diff --git a/mysql-test/r/having.result b/mysql-test/main/having.result
index 6c206a1699d..6c206a1699d 100644
--- a/mysql-test/r/having.result
+++ b/mysql-test/main/having.result
diff --git a/mysql-test/t/having.test b/mysql-test/main/having.test
index c9231fef3be..c9231fef3be 100644
--- a/mysql-test/t/having.test
+++ b/mysql-test/main/having.test
diff --git a/mysql-test/r/help.result b/mysql-test/main/help.result
index 66850e75dc1..66850e75dc1 100644
--- a/mysql-test/r/help.result
+++ b/mysql-test/main/help.result
diff --git a/mysql-test/t/help.test b/mysql-test/main/help.test
index 802f24f80a9..802f24f80a9 100644
--- a/mysql-test/t/help.test
+++ b/mysql-test/main/help.test
diff --git a/mysql-test/r/host_cache_size_functionality.result b/mysql-test/main/host_cache_size_functionality.result
index 069cf61bcad..069cf61bcad 100644
--- a/mysql-test/r/host_cache_size_functionality.result
+++ b/mysql-test/main/host_cache_size_functionality.result
diff --git a/mysql-test/t/host_cache_size_functionality.test b/mysql-test/main/host_cache_size_functionality.test
index 5a7376cc5eb..5a7376cc5eb 100644
--- a/mysql-test/t/host_cache_size_functionality.test
+++ b/mysql-test/main/host_cache_size_functionality.test
diff --git a/mysql-test/r/huge_frm-6224.result b/mysql-test/main/huge_frm-6224.result
index 3772317c04d..3772317c04d 100644
--- a/mysql-test/r/huge_frm-6224.result
+++ b/mysql-test/main/huge_frm-6224.result
diff --git a/mysql-test/t/huge_frm-6224.test b/mysql-test/main/huge_frm-6224.test
index 418722a7b51..418722a7b51 100644
--- a/mysql-test/t/huge_frm-6224.test
+++ b/mysql-test/main/huge_frm-6224.test
diff --git a/mysql-test/r/implicit_char_to_num_conversion.result b/mysql-test/main/implicit_char_to_num_conversion.result
index 8f24a6b293c..8f24a6b293c 100644
--- a/mysql-test/r/implicit_char_to_num_conversion.result
+++ b/mysql-test/main/implicit_char_to_num_conversion.result
diff --git a/mysql-test/t/implicit_char_to_num_conversion.test b/mysql-test/main/implicit_char_to_num_conversion.test
index f3da83ff2c1..f3da83ff2c1 100644
--- a/mysql-test/t/implicit_char_to_num_conversion.test
+++ b/mysql-test/main/implicit_char_to_num_conversion.test
diff --git a/mysql-test/t/implicit_commit-master.opt b/mysql-test/main/implicit_commit-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/implicit_commit-master.opt
+++ b/mysql-test/main/implicit_commit-master.opt
diff --git a/mysql-test/r/implicit_commit.result b/mysql-test/main/implicit_commit.result
index 07536ab0719..07536ab0719 100644
--- a/mysql-test/r/implicit_commit.result
+++ b/mysql-test/main/implicit_commit.result
diff --git a/mysql-test/t/implicit_commit.test b/mysql-test/main/implicit_commit.test
index bcc43865395..bcc43865395 100644
--- a/mysql-test/t/implicit_commit.test
+++ b/mysql-test/main/implicit_commit.test
diff --git a/mysql-test/r/in_datetime_241.result b/mysql-test/main/in_datetime_241.result
index 2c5b4bd8db1..2c5b4bd8db1 100644
--- a/mysql-test/r/in_datetime_241.result
+++ b/mysql-test/main/in_datetime_241.result
diff --git a/mysql-test/t/in_datetime_241.test b/mysql-test/main/in_datetime_241.test
index f95a456f5e2..f95a456f5e2 100644
--- a/mysql-test/t/in_datetime_241.test
+++ b/mysql-test/main/in_datetime_241.test
diff --git a/mysql-test/r/index_intersect.result b/mysql-test/main/index_intersect.result
index 7a0633d4dc8..7a0633d4dc8 100644
--- a/mysql-test/r/index_intersect.result
+++ b/mysql-test/main/index_intersect.result
diff --git a/mysql-test/t/index_intersect.test b/mysql-test/main/index_intersect.test
index 1be963cb9e5..1be963cb9e5 100644
--- a/mysql-test/t/index_intersect.test
+++ b/mysql-test/main/index_intersect.test
diff --git a/mysql-test/r/index_intersect_innodb.result b/mysql-test/main/index_intersect_innodb.result
index 15244098170..15244098170 100644
--- a/mysql-test/r/index_intersect_innodb.result
+++ b/mysql-test/main/index_intersect_innodb.result
diff --git a/mysql-test/t/index_intersect_innodb.test b/mysql-test/main/index_intersect_innodb.test
index 22c0e807558..f2e44cb3947 100644
--- a/mysql-test/t/index_intersect_innodb.test
+++ b/mysql-test/main/index_intersect_innodb.test
@@ -2,6 +2,6 @@
 
 SET SESSION STORAGE_ENGINE='InnoDB';
 
---source t/index_intersect.test
+--source index_intersect.test
 
 SET SESSION STORAGE_ENGINE=DEFAULT;
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/main/index_merge_innodb.result
index 6a3ea839535..6a3ea839535 100644
--- a/mysql-test/r/index_merge_innodb.result
+++ b/mysql-test/main/index_merge_innodb.result
diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/main/index_merge_innodb.test
index 53ce3114b49..53ce3114b49 100644
--- a/mysql-test/t/index_merge_innodb.test
+++ b/mysql-test/main/index_merge_innodb.test
diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/main/index_merge_myisam.result
index 992e1d831b5..992e1d831b5 100644
--- a/mysql-test/r/index_merge_myisam.result
+++ b/mysql-test/main/index_merge_myisam.result
diff --git a/mysql-test/t/index_merge_myisam.test b/mysql-test/main/index_merge_myisam.test
index d265007431e..d265007431e 100644
--- a/mysql-test/t/index_merge_myisam.test
+++ b/mysql-test/main/index_merge_myisam.test
diff --git a/mysql-test/r/information_schema-big.result b/mysql-test/main/information_schema-big.result
index cbd8191bc54..cbd8191bc54 100644
--- a/mysql-test/r/information_schema-big.result
+++ b/mysql-test/main/information_schema-big.result
diff --git a/mysql-test/t/information_schema-big.test b/mysql-test/main/information_schema-big.test
index 9212348649e..9212348649e 100644
--- a/mysql-test/t/information_schema-big.test
+++ b/mysql-test/main/information_schema-big.test
diff --git a/mysql-test/r/information_schema.result b/mysql-test/main/information_schema.result
index 5fcda217d01..5fcda217d01 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/main/information_schema.result
diff --git a/mysql-test/t/information_schema.test b/mysql-test/main/information_schema.test
index 1f72d0b6129..1f72d0b6129 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/main/information_schema.test
diff --git a/mysql-test/r/information_schema2.result b/mysql-test/main/information_schema2.result
index e23e81b885c..e23e81b885c 100644
--- a/mysql-test/r/information_schema2.result
+++ b/mysql-test/main/information_schema2.result
diff --git a/mysql-test/t/information_schema2.test b/mysql-test/main/information_schema2.test
index d2fa3da2b5f..d2fa3da2b5f 100644
--- a/mysql-test/t/information_schema2.test
+++ b/mysql-test/main/information_schema2.test
diff --git a/mysql-test/t/information_schema_all_engines-master.opt b/mysql-test/main/information_schema_all_engines-master.opt
index 43411c5033a..43411c5033a 100644
--- a/mysql-test/t/information_schema_all_engines-master.opt
+++ b/mysql-test/main/information_schema_all_engines-master.opt
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/main/information_schema_all_engines.result
index 8a92f0226ff..8a92f0226ff 100644
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/main/information_schema_all_engines.result
diff --git a/mysql-test/t/information_schema_all_engines.test b/mysql-test/main/information_schema_all_engines.test
index f8d685d2560..f8d685d2560 100644
--- a/mysql-test/t/information_schema_all_engines.test
+++ b/mysql-test/main/information_schema_all_engines.test
diff --git a/mysql-test/r/information_schema_chmod.result b/mysql-test/main/information_schema_chmod.result
index 36124559439..36124559439 100644
--- a/mysql-test/r/information_schema_chmod.result
+++ b/mysql-test/main/information_schema_chmod.result
diff --git a/mysql-test/t/information_schema_chmod.test b/mysql-test/main/information_schema_chmod.test
index 39e2f680bb8..39e2f680bb8 100644
--- a/mysql-test/t/information_schema_chmod.test
+++ b/mysql-test/main/information_schema_chmod.test
diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/main/information_schema_db.result
index 45ade65c502..45ade65c502 100644
--- a/mysql-test/r/information_schema_db.result
+++ b/mysql-test/main/information_schema_db.result
diff --git a/mysql-test/t/information_schema_db.test b/mysql-test/main/information_schema_db.test
index 94908570969..94908570969 100644
--- a/mysql-test/t/information_schema_db.test
+++ b/mysql-test/main/information_schema_db.test
diff --git a/mysql-test/r/information_schema_inno.result b/mysql-test/main/information_schema_inno.result
index d952e4372ca..d952e4372ca 100644
--- a/mysql-test/r/information_schema_inno.result
+++ b/mysql-test/main/information_schema_inno.result
diff --git a/mysql-test/t/information_schema_inno.test b/mysql-test/main/information_schema_inno.test
index 3cdbb8111d9..3cdbb8111d9 100644
--- a/mysql-test/t/information_schema_inno.test
+++ b/mysql-test/main/information_schema_inno.test
diff --git a/mysql-test/r/information_schema_linux.result b/mysql-test/main/information_schema_linux.result
index b4b7de7bc65..b4b7de7bc65 100644
--- a/mysql-test/r/information_schema_linux.result
+++ b/mysql-test/main/information_schema_linux.result
diff --git a/mysql-test/t/information_schema_linux.test b/mysql-test/main/information_schema_linux.test
index 0e3170080c3..0e3170080c3 100644
--- a/mysql-test/t/information_schema_linux.test
+++ b/mysql-test/main/information_schema_linux.test
diff --git a/mysql-test/r/information_schema_parameters.result b/mysql-test/main/information_schema_parameters.result
index a215c86c388..a215c86c388 100644
--- a/mysql-test/r/information_schema_parameters.result
+++ b/mysql-test/main/information_schema_parameters.result
diff --git a/mysql-test/t/information_schema_parameters.test b/mysql-test/main/information_schema_parameters.test
index bf25a6757f0..bf25a6757f0 100644
--- a/mysql-test/t/information_schema_parameters.test
+++ b/mysql-test/main/information_schema_parameters.test
diff --git a/mysql-test/r/information_schema_part.result b/mysql-test/main/information_schema_part.result
index 4c0bb8908da..4c0bb8908da 100644
--- a/mysql-test/r/information_schema_part.result
+++ b/mysql-test/main/information_schema_part.result
diff --git a/mysql-test/t/information_schema_part.test b/mysql-test/main/information_schema_part.test
index 62fba4f53d8..62fba4f53d8 100644
--- a/mysql-test/t/information_schema_part.test
+++ b/mysql-test/main/information_schema_part.test
diff --git a/mysql-test/r/information_schema_routines.result b/mysql-test/main/information_schema_routines.result
index eaa69adf740..eaa69adf740 100644
--- a/mysql-test/r/information_schema_routines.result
+++ b/mysql-test/main/information_schema_routines.result
diff --git a/mysql-test/t/information_schema_routines.test b/mysql-test/main/information_schema_routines.test
index 190410c2b82..190410c2b82 100644
--- a/mysql-test/t/information_schema_routines.test
+++ b/mysql-test/main/information_schema_routines.test
diff --git a/mysql-test/r/information_schema_stats.result b/mysql-test/main/information_schema_stats.result
index bc2ce9f0294..bc2ce9f0294 100644
--- a/mysql-test/r/information_schema_stats.result
+++ b/mysql-test/main/information_schema_stats.result
diff --git a/mysql-test/t/information_schema_stats.test b/mysql-test/main/information_schema_stats.test
index c7f39894ce7..c7f39894ce7 100644
--- a/mysql-test/t/information_schema_stats.test
+++ b/mysql-test/main/information_schema_stats.test
diff --git a/mysql-test/t/init_connect-master.opt b/mysql-test/main/init_connect-master.opt
index db17a49c058..db17a49c058 100644
--- a/mysql-test/t/init_connect-master.opt
+++ b/mysql-test/main/init_connect-master.opt
diff --git a/mysql-test/r/init_connect.result b/mysql-test/main/init_connect.result
index 11bb6036156..11bb6036156 100644
--- a/mysql-test/r/init_connect.result
+++ b/mysql-test/main/init_connect.result
diff --git a/mysql-test/t/init_connect.test b/mysql-test/main/init_connect.test
index e96d02fe0d1..e96d02fe0d1 100644
--- a/mysql-test/t/init_connect.test
+++ b/mysql-test/main/init_connect.test
diff --git a/mysql-test/t/init_connection_query_cache-master.opt b/mysql-test/main/init_connection_query_cache-master.opt
index 7bef2af8d35..7bef2af8d35 100644
--- a/mysql-test/t/init_connection_query_cache-master.opt
+++ b/mysql-test/main/init_connection_query_cache-master.opt
diff --git a/mysql-test/r/init_connection_query_cache.result b/mysql-test/main/init_connection_query_cache.result
index eacc06c05f6..eacc06c05f6 100644
--- a/mysql-test/r/init_connection_query_cache.result
+++ b/mysql-test/main/init_connection_query_cache.result
diff --git a/mysql-test/t/init_connection_query_cache.test b/mysql-test/main/init_connection_query_cache.test
index 4d83304163e..4d83304163e 100644
--- a/mysql-test/t/init_connection_query_cache.test
+++ b/mysql-test/main/init_connection_query_cache.test
diff --git a/mysql-test/t/init_file.opt b/mysql-test/main/init_file.opt
index f6af01ee2c3..f6af01ee2c3 100644
--- a/mysql-test/t/init_file.opt
+++ b/mysql-test/main/init_file.opt
diff --git a/mysql-test/r/init_file.result b/mysql-test/main/init_file.result
index 8e014815a9c..8e014815a9c 100644
--- a/mysql-test/r/init_file.result
+++ b/mysql-test/main/init_file.result
diff --git a/mysql-test/t/init_file.test b/mysql-test/main/init_file.test
index 65e54db43ea..65e54db43ea 100644
--- a/mysql-test/t/init_file.test
+++ b/mysql-test/main/init_file.test
diff --git a/mysql-test/t/init_file_longline_3816.opt b/mysql-test/main/init_file_longline_3816.opt
index 9ddb6fa8565..9ddb6fa8565 100644
--- a/mysql-test/t/init_file_longline_3816.opt
+++ b/mysql-test/main/init_file_longline_3816.opt
diff --git a/mysql-test/r/init_file_longline_3816.result b/mysql-test/main/init_file_longline_3816.result
index 0155f764592..0155f764592 100644
--- a/mysql-test/r/init_file_longline_3816.result
+++ b/mysql-test/main/init_file_longline_3816.result
diff --git a/mysql-test/t/init_file_longline_3816.test b/mysql-test/main/init_file_longline_3816.test
index 5db2fcb0c73..5db2fcb0c73 100644
--- a/mysql-test/t/init_file_longline_3816.test
+++ b/mysql-test/main/init_file_longline_3816.test
diff --git a/mysql-test/r/init_file_set_password-7656.result b/mysql-test/main/init_file_set_password-7656.result
index e5b3fc75706..e5b3fc75706 100644
--- a/mysql-test/r/init_file_set_password-7656.result
+++ b/mysql-test/main/init_file_set_password-7656.result
diff --git a/mysql-test/t/init_file_set_password-7656.test b/mysql-test/main/init_file_set_password-7656.test
index ecee3924355..ecee3924355 100644
--- a/mysql-test/t/init_file_set_password-7656.test
+++ b/mysql-test/main/init_file_set_password-7656.test
diff --git a/mysql-test/r/innodb_bug878769.result b/mysql-test/main/innodb_bug878769.result
index db7ba3d2ee4..db7ba3d2ee4 100644
--- a/mysql-test/r/innodb_bug878769.result
+++ b/mysql-test/main/innodb_bug878769.result
diff --git a/mysql-test/t/innodb_bug878769.test b/mysql-test/main/innodb_bug878769.test
index 157c7827dde..157c7827dde 100644
--- a/mysql-test/t/innodb_bug878769.test
+++ b/mysql-test/main/innodb_bug878769.test
diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result
index c55e8d138f8..c55e8d138f8 100644
--- a/mysql-test/r/innodb_ext_key.result
+++ b/mysql-test/main/innodb_ext_key.result
diff --git a/mysql-test/t/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test
index a721943e8bc..a721943e8bc 100644
--- a/mysql-test/t/innodb_ext_key.test
+++ b/mysql-test/main/innodb_ext_key.test
diff --git a/mysql-test/r/innodb_group.result b/mysql-test/main/innodb_group.result
index 58bd75e0baf..58bd75e0baf 100644
--- a/mysql-test/r/innodb_group.result
+++ b/mysql-test/main/innodb_group.result
diff --git a/mysql-test/t/innodb_group.test b/mysql-test/main/innodb_group.test
index 56c8d54003e..56c8d54003e 100644
--- a/mysql-test/t/innodb_group.test
+++ b/mysql-test/main/innodb_group.test
diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/main/innodb_icp.result
index 8a58a769ed9..8a58a769ed9 100644
--- a/mysql-test/r/innodb_icp.result
+++ b/mysql-test/main/innodb_icp.result
diff --git a/mysql-test/t/innodb_icp.test b/mysql-test/main/innodb_icp.test
index acb8238e01f..acb8238e01f 100644
--- a/mysql-test/t/innodb_icp.test
+++ b/mysql-test/main/innodb_icp.test
diff --git a/mysql-test/t/innodb_ignore_builtin-master.opt b/mysql-test/main/innodb_ignore_builtin-master.opt
index f7289eed20e..f7289eed20e 100644
--- a/mysql-test/t/innodb_ignore_builtin-master.opt
+++ b/mysql-test/main/innodb_ignore_builtin-master.opt
diff --git a/mysql-test/r/innodb_ignore_builtin.result b/mysql-test/main/innodb_ignore_builtin.result
index e65cb3c7850..e65cb3c7850 100644
--- a/mysql-test/r/innodb_ignore_builtin.result
+++ b/mysql-test/main/innodb_ignore_builtin.result
diff --git a/mysql-test/t/innodb_ignore_builtin.test b/mysql-test/main/innodb_ignore_builtin.test
index 66f7e47b703..66f7e47b703 100644
--- a/mysql-test/t/innodb_ignore_builtin.test
+++ b/mysql-test/main/innodb_ignore_builtin.test
diff --git a/mysql-test/t/innodb_load_xa.opt b/mysql-test/main/innodb_load_xa.opt
index 9e9ea9a1600..9e9ea9a1600 100644
--- a/mysql-test/t/innodb_load_xa.opt
+++ b/mysql-test/main/innodb_load_xa.opt
diff --git a/mysql-test/r/innodb_load_xa.result b/mysql-test/main/innodb_load_xa.result
index 515c820b40c..515c820b40c 100644
--- a/mysql-test/r/innodb_load_xa.result
+++ b/mysql-test/main/innodb_load_xa.result
diff --git a/mysql-test/t/innodb_load_xa.test b/mysql-test/main/innodb_load_xa.test
index 65b74120e8e..65b74120e8e 100644
--- a/mysql-test/t/innodb_load_xa.test
+++ b/mysql-test/main/innodb_load_xa.test
diff --git a/mysql-test/r/innodb_mrr_cpk.result b/mysql-test/main/innodb_mrr_cpk.result
index 28d7dd51df8..28d7dd51df8 100644
--- a/mysql-test/r/innodb_mrr_cpk.result
+++ b/mysql-test/main/innodb_mrr_cpk.result
diff --git a/mysql-test/t/innodb_mrr_cpk.test b/mysql-test/main/innodb_mrr_cpk.test
index cb79c238f2b..cb79c238f2b 100644
--- a/mysql-test/t/innodb_mrr_cpk.test
+++ b/mysql-test/main/innodb_mrr_cpk.test
diff --git a/mysql-test/r/innodb_mysql_lock.result b/mysql-test/main/innodb_mysql_lock.result
index 584ab19b2ee..584ab19b2ee 100644
--- a/mysql-test/r/innodb_mysql_lock.result
+++ b/mysql-test/main/innodb_mysql_lock.result
diff --git a/mysql-test/t/innodb_mysql_lock.test b/mysql-test/main/innodb_mysql_lock.test
index 24ace437c50..24ace437c50 100644
--- a/mysql-test/t/innodb_mysql_lock.test
+++ b/mysql-test/main/innodb_mysql_lock.test
diff --git a/mysql-test/r/innodb_mysql_lock2.result b/mysql-test/main/innodb_mysql_lock2.result
index df97b32a41c..df97b32a41c 100644
--- a/mysql-test/r/innodb_mysql_lock2.result
+++ b/mysql-test/main/innodb_mysql_lock2.result
diff --git a/mysql-test/t/innodb_mysql_lock2.test b/mysql-test/main/innodb_mysql_lock2.test
index f319fe23568..f319fe23568 100644
--- a/mysql-test/t/innodb_mysql_lock2.test
+++ b/mysql-test/main/innodb_mysql_lock2.test
diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/main/innodb_mysql_sync.result
index a8a264d6580..a8a264d6580 100644
--- a/mysql-test/r/innodb_mysql_sync.result
+++ b/mysql-test/main/innodb_mysql_sync.result
diff --git a/mysql-test/t/innodb_mysql_sync.test b/mysql-test/main/innodb_mysql_sync.test
index 66935f811d7..66935f811d7 100644
--- a/mysql-test/t/innodb_mysql_sync.test
+++ b/mysql-test/main/innodb_mysql_sync.test
diff --git a/mysql-test/r/innodb_utf8.result b/mysql-test/main/innodb_utf8.result
index cdac7cdb65b..cdac7cdb65b 100644
--- a/mysql-test/r/innodb_utf8.result
+++ b/mysql-test/main/innodb_utf8.result
diff --git a/mysql-test/t/innodb_utf8.test b/mysql-test/main/innodb_utf8.test
index e52019588b0..e52019588b0 100644
--- a/mysql-test/t/innodb_utf8.test
+++ b/mysql-test/main/innodb_utf8.test
diff --git a/mysql-test/r/insert.result b/mysql-test/main/insert.result
index 736aa917cae..736aa917cae 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/main/insert.result
diff --git a/mysql-test/t/insert.test b/mysql-test/main/insert.test
index d57e9051e3f..d57e9051e3f 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/main/insert.test
diff --git a/mysql-test/r/insert_innodb.result b/mysql-test/main/insert_innodb.result
index e5e2b4b8623..e5e2b4b8623 100644
--- a/mysql-test/r/insert_innodb.result
+++ b/mysql-test/main/insert_innodb.result
diff --git a/mysql-test/t/insert_innodb.test b/mysql-test/main/insert_innodb.test
index 68b6ca4e315..68b6ca4e315 100644
--- a/mysql-test/t/insert_innodb.test
+++ b/mysql-test/main/insert_innodb.test
diff --git a/mysql-test/r/insert_notembedded.result b/mysql-test/main/insert_notembedded.result
index 8dd4aa7d71e..8dd4aa7d71e 100644
--- a/mysql-test/r/insert_notembedded.result
+++ b/mysql-test/main/insert_notembedded.result
diff --git a/mysql-test/t/insert_notembedded.test b/mysql-test/main/insert_notembedded.test
index 2769aee8d8a..2769aee8d8a 100644
--- a/mysql-test/t/insert_notembedded.test
+++ b/mysql-test/main/insert_notembedded.test
diff --git a/mysql-test/r/insert_select.result b/mysql-test/main/insert_select.result
index 1a3a38b1f35..1a3a38b1f35 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/main/insert_select.result
diff --git a/mysql-test/t/insert_select.test b/mysql-test/main/insert_select.test
index fda89f18d99..fda89f18d99 100644
--- a/mysql-test/t/insert_select.test
+++ b/mysql-test/main/insert_select.test
diff --git a/mysql-test/r/insert_update.result b/mysql-test/main/insert_update.result
index 68a1003ad85..68a1003ad85 100644
--- a/mysql-test/r/insert_update.result
+++ b/mysql-test/main/insert_update.result
diff --git a/mysql-test/t/insert_update.test b/mysql-test/main/insert_update.test
index 06e16be84d7..06e16be84d7 100644
--- a/mysql-test/t/insert_update.test
+++ b/mysql-test/main/insert_update.test
diff --git a/mysql-test/r/insert_update_autoinc-7150.result b/mysql-test/main/insert_update_autoinc-7150.result
index 96773479310..96773479310 100644
--- a/mysql-test/r/insert_update_autoinc-7150.result
+++ b/mysql-test/main/insert_update_autoinc-7150.result
diff --git a/mysql-test/t/insert_update_autoinc-7150.test b/mysql-test/main/insert_update_autoinc-7150.test
index 1229898b4aa..1229898b4aa 100644
--- a/mysql-test/t/insert_update_autoinc-7150.test
+++ b/mysql-test/main/insert_update_autoinc-7150.test
diff --git a/mysql-test/r/intersect.result b/mysql-test/main/intersect.result
index b589e8bd17e..b589e8bd17e 100644
--- a/mysql-test/r/intersect.result
+++ b/mysql-test/main/intersect.result
diff --git a/mysql-test/t/intersect.test b/mysql-test/main/intersect.test
index d9d420c786b..d9d420c786b 100644
--- a/mysql-test/t/intersect.test
+++ b/mysql-test/main/intersect.test
diff --git a/mysql-test/r/invisible_binlog.result b/mysql-test/main/invisible_binlog.result
index 088bc858e28..088bc858e28 100644
--- a/mysql-test/r/invisible_binlog.result
+++ b/mysql-test/main/invisible_binlog.result
diff --git a/mysql-test/t/invisible_binlog.test b/mysql-test/main/invisible_binlog.test
index 654afcc39c3..654afcc39c3 100644
--- a/mysql-test/t/invisible_binlog.test
+++ b/mysql-test/main/invisible_binlog.test
diff --git a/mysql-test/r/invisible_field.result b/mysql-test/main/invisible_field.result
index c331f3fca88..c331f3fca88 100644
--- a/mysql-test/r/invisible_field.result
+++ b/mysql-test/main/invisible_field.result
diff --git a/mysql-test/t/invisible_field.test b/mysql-test/main/invisible_field.test
index 884abb1238d..884abb1238d 100644
--- a/mysql-test/t/invisible_field.test
+++ b/mysql-test/main/invisible_field.test
diff --git a/mysql-test/r/invisible_field_debug.result b/mysql-test/main/invisible_field_debug.result
index 4c4ebffbdfc..4c4ebffbdfc 100644
--- a/mysql-test/r/invisible_field_debug.result
+++ b/mysql-test/main/invisible_field_debug.result
diff --git a/mysql-test/t/invisible_field_debug.test b/mysql-test/main/invisible_field_debug.test
index 8674620e055..8674620e055 100644
--- a/mysql-test/t/invisible_field_debug.test
+++ b/mysql-test/main/invisible_field_debug.test
diff --git a/mysql-test/t/ipv4_and_ipv6.opt b/mysql-test/main/ipv4_and_ipv6.opt
index a22a7b100c8..a22a7b100c8 100644
--- a/mysql-test/t/ipv4_and_ipv6.opt
+++ b/mysql-test/main/ipv4_and_ipv6.opt
diff --git a/mysql-test/r/ipv4_and_ipv6.result b/mysql-test/main/ipv4_and_ipv6.result
index 447c20536e2..447c20536e2 100644
--- a/mysql-test/r/ipv4_and_ipv6.result
+++ b/mysql-test/main/ipv4_and_ipv6.result
diff --git a/mysql-test/t/ipv4_and_ipv6.test b/mysql-test/main/ipv4_and_ipv6.test
index 19ab4a253cc..19ab4a253cc 100644
--- a/mysql-test/t/ipv4_and_ipv6.test
+++ b/mysql-test/main/ipv4_and_ipv6.test
diff --git a/mysql-test/t/ipv4_as_ipv6-master.opt b/mysql-test/main/ipv4_as_ipv6-master.opt
index f55a8e9209d..f55a8e9209d 100644
--- a/mysql-test/t/ipv4_as_ipv6-master.opt
+++ b/mysql-test/main/ipv4_as_ipv6-master.opt
diff --git a/mysql-test/r/ipv4_as_ipv6.result b/mysql-test/main/ipv4_as_ipv6.result
index b92b545da86..b92b545da86 100644
--- a/mysql-test/r/ipv4_as_ipv6.result
+++ b/mysql-test/main/ipv4_as_ipv6.result
diff --git a/mysql-test/t/ipv4_as_ipv6.test b/mysql-test/main/ipv4_as_ipv6.test
index 2a3ab6647ff..2a3ab6647ff 100644
--- a/mysql-test/t/ipv4_as_ipv6.test
+++ b/mysql-test/main/ipv4_as_ipv6.test
diff --git a/mysql-test/t/ipv6-master.opt b/mysql-test/main/ipv6-master.opt
index d705811808c..d705811808c 100644
--- a/mysql-test/t/ipv6-master.opt
+++ b/mysql-test/main/ipv6-master.opt
diff --git a/mysql-test/r/ipv6.result b/mysql-test/main/ipv6.result
index 1540b4825e5..1540b4825e5 100644
--- a/mysql-test/r/ipv6.result
+++ b/mysql-test/main/ipv6.result
diff --git a/mysql-test/t/ipv6.test b/mysql-test/main/ipv6.test
index 24ab09b7083..24ab09b7083 100644
--- a/mysql-test/t/ipv6.test
+++ b/mysql-test/main/ipv6.test
diff --git a/mysql-test/r/join.result b/mysql-test/main/join.result
index 046674d5569..046674d5569 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/main/join.result
diff --git a/mysql-test/t/join.test b/mysql-test/main/join.test
index e07a3665920..e07a3665920 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/main/join.test
diff --git a/mysql-test/r/join_cache.result b/mysql-test/main/join_cache.result
index eea397402ad..eea397402ad 100644
--- a/mysql-test/r/join_cache.result
+++ b/mysql-test/main/join_cache.result
diff --git a/mysql-test/t/join_cache.test b/mysql-test/main/join_cache.test
index b775725903c..b775725903c 100644
--- a/mysql-test/t/join_cache.test
+++ b/mysql-test/main/join_cache.test
diff --git a/mysql-test/r/join_crash.result b/mysql-test/main/join_crash.result
index f1a3b4956a8..f1a3b4956a8 100644
--- a/mysql-test/r/join_crash.result
+++ b/mysql-test/main/join_crash.result
diff --git a/mysql-test/t/join_crash.test b/mysql-test/main/join_crash.test
index 2ec96dc2c28..2ec96dc2c28 100644
--- a/mysql-test/t/join_crash.test
+++ b/mysql-test/main/join_crash.test
diff --git a/mysql-test/r/join_nested.result b/mysql-test/main/join_nested.result
index 708c72fffb5..708c72fffb5 100644
--- a/mysql-test/r/join_nested.result
+++ b/mysql-test/main/join_nested.result
diff --git a/mysql-test/t/join_nested.test b/mysql-test/main/join_nested.test
index e60b7827f75..e60b7827f75 100644
--- a/mysql-test/t/join_nested.test
+++ b/mysql-test/main/join_nested.test
diff --git a/mysql-test/r/join_nested_jcl6.result b/mysql-test/main/join_nested_jcl6.result
index eb59531b7d2..eb59531b7d2 100644
--- a/mysql-test/r/join_nested_jcl6.result
+++ b/mysql-test/main/join_nested_jcl6.result
diff --git a/mysql-test/t/join_nested_jcl6.test b/mysql-test/main/join_nested_jcl6.test
index 0e8646bceda..838427e85e6 100644
--- a/mysql-test/t/join_nested_jcl6.test
+++ b/mysql-test/main/join_nested_jcl6.test
@@ -14,7 +14,7 @@ show variables like 'join_cache_level';
 set @optimizer_switch_for_join_nested_test=@@optimizer_switch;
 set @join_cache_level_for_join_nested_test=@@join_cache_level;
 
---source t/join_nested.test
+--source join_nested.test
 
 #
 # BUG#35835: queries with nested outer joins with BKA enabled
diff --git a/mysql-test/r/join_optimizer.result b/mysql-test/main/join_optimizer.result
index ad7267ab665..ad7267ab665 100644
--- a/mysql-test/r/join_optimizer.result
+++ b/mysql-test/main/join_optimizer.result
diff --git a/mysql-test/t/join_optimizer.test b/mysql-test/main/join_optimizer.test
index 3afe82113b9..3afe82113b9 100644
--- a/mysql-test/t/join_optimizer.test
+++ b/mysql-test/main/join_optimizer.test
diff --git a/mysql-test/r/join_outer.result b/mysql-test/main/join_outer.result
index 6753349dece..6753349dece 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/main/join_outer.result
diff --git a/mysql-test/t/join_outer.test b/mysql-test/main/join_outer.test
index 34b0551a32e..34b0551a32e 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/main/join_outer.test
diff --git a/mysql-test/r/join_outer_innodb.result b/mysql-test/main/join_outer_innodb.result
index 6f3fb09329d..6f3fb09329d 100644
--- a/mysql-test/r/join_outer_innodb.result
+++ b/mysql-test/main/join_outer_innodb.result
diff --git a/mysql-test/t/join_outer_innodb.test b/mysql-test/main/join_outer_innodb.test
index fe08689c80b..fe08689c80b 100644
--- a/mysql-test/t/join_outer_innodb.test
+++ b/mysql-test/main/join_outer_innodb.test
diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/main/join_outer_jcl6.result
index 9ff501baf6a..9ff501baf6a 100644
--- a/mysql-test/r/join_outer_jcl6.result
+++ b/mysql-test/main/join_outer_jcl6.result
diff --git a/mysql-test/t/join_outer_jcl6.test b/mysql-test/main/join_outer_jcl6.test
index e34cc615216..9db06c783bd 100644
--- a/mysql-test/t/join_outer_jcl6.test
+++ b/mysql-test/main/join_outer_jcl6.test
@@ -14,7 +14,7 @@ show variables like 'join_cache_level';
 set @optimizer_switch_for_join_outer_test=@@optimizer_switch;
 set @join_cache_level_for_join_outer_test=@@join_cache_level;
 
---source t/join_outer.test
+--source join_outer.test
 
 set join_cache_level=default;
 show variables like 'join_cache_level';
diff --git a/mysql-test/r/key.result b/mysql-test/main/key.result
index ba1124aaa14..ba1124aaa14 100644
--- a/mysql-test/r/key.result
+++ b/mysql-test/main/key.result
diff --git a/mysql-test/t/key.test b/mysql-test/main/key.test
index 0695dc2eecb..0695dc2eecb 100644
--- a/mysql-test/t/key.test
+++ b/mysql-test/main/key.test
diff --git a/mysql-test/t/key_cache-master.opt b/mysql-test/main/key_cache-master.opt
index 66e19c18a8a..66e19c18a8a 100644
--- a/mysql-test/t/key_cache-master.opt
+++ b/mysql-test/main/key_cache-master.opt
diff --git a/mysql-test/r/key_cache.result b/mysql-test/main/key_cache.result
index 1146ae8bbfa..1146ae8bbfa 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/main/key_cache.result
diff --git a/mysql-test/t/key_cache.test b/mysql-test/main/key_cache.test
index d28e7c23a4c..d28e7c23a4c 100644
--- a/mysql-test/t/key_cache.test
+++ b/mysql-test/main/key_cache.test
diff --git a/mysql-test/r/key_diff.result b/mysql-test/main/key_diff.result
index af928fcb203..af928fcb203 100644
--- a/mysql-test/r/key_diff.result
+++ b/mysql-test/main/key_diff.result
diff --git a/mysql-test/t/key_diff.test b/mysql-test/main/key_diff.test
index b490c613c61..b490c613c61 100644
--- a/mysql-test/t/key_diff.test
+++ b/mysql-test/main/key_diff.test
diff --git a/mysql-test/r/key_primary.result b/mysql-test/main/key_primary.result
index 7726a8e1d63..7726a8e1d63 100644
--- a/mysql-test/r/key_primary.result
+++ b/mysql-test/main/key_primary.result
diff --git a/mysql-test/t/key_primary.test b/mysql-test/main/key_primary.test
index 1ca2059b871..1ca2059b871 100644
--- a/mysql-test/t/key_primary.test
+++ b/mysql-test/main/key_primary.test
diff --git a/mysql-test/r/keyread.result b/mysql-test/main/keyread.result
index d8e9659d4bb..d8e9659d4bb 100644
--- a/mysql-test/r/keyread.result
+++ b/mysql-test/main/keyread.result
diff --git a/mysql-test/t/keyread.test b/mysql-test/main/keyread.test
index d9d3002d392..d9d3002d392 100644
--- a/mysql-test/t/keyread.test
+++ b/mysql-test/main/keyread.test
diff --git a/mysql-test/r/keywords.result b/mysql-test/main/keywords.result
index e2f29f7cfb5..e2f29f7cfb5 100644
--- a/mysql-test/r/keywords.result
+++ b/mysql-test/main/keywords.result
diff --git a/mysql-test/t/keywords.test b/mysql-test/main/keywords.test
index 4ac8f56afc5..4ac8f56afc5 100644
--- a/mysql-test/t/keywords.test
+++ b/mysql-test/main/keywords.test
diff --git a/mysql-test/t/kill-2-master.opt b/mysql-test/main/kill-2-master.opt
index ab6ca1731f5..ab6ca1731f5 100644
--- a/mysql-test/t/kill-2-master.opt
+++ b/mysql-test/main/kill-2-master.opt
diff --git a/mysql-test/r/kill-2.result b/mysql-test/main/kill-2.result
index daaba2c092a..daaba2c092a 100644
--- a/mysql-test/r/kill-2.result
+++ b/mysql-test/main/kill-2.result
diff --git a/mysql-test/t/kill-2.test b/mysql-test/main/kill-2.test
index 0c1177722b4..0c1177722b4 100644
--- a/mysql-test/t/kill-2.test
+++ b/mysql-test/main/kill-2.test
diff --git a/mysql-test/r/kill.result b/mysql-test/main/kill.result
index dc1cb9252da..dc1cb9252da 100644
--- a/mysql-test/r/kill.result
+++ b/mysql-test/main/kill.result
diff --git a/mysql-test/t/kill.test b/mysql-test/main/kill.test
index b6000ffced1..b6000ffced1 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/main/kill.test
diff --git a/mysql-test/r/kill_processlist-6619.result b/mysql-test/main/kill_processlist-6619.result
index 7dd42790cc7..7dd42790cc7 100644
--- a/mysql-test/r/kill_processlist-6619.result
+++ b/mysql-test/main/kill_processlist-6619.result
diff --git a/mysql-test/t/kill_processlist-6619.test b/mysql-test/main/kill_processlist-6619.test
index d984924f9db..d984924f9db 100644
--- a/mysql-test/t/kill_processlist-6619.test
+++ b/mysql-test/main/kill_processlist-6619.test
diff --git a/mysql-test/r/kill_query-6728.result b/mysql-test/main/kill_query-6728.result
index 6638edebeea..6638edebeea 100644
--- a/mysql-test/r/kill_query-6728.result
+++ b/mysql-test/main/kill_query-6728.result
diff --git a/mysql-test/t/kill_query-6728.test b/mysql-test/main/kill_query-6728.test
index a04c51a88dc..a04c51a88dc 100644
--- a/mysql-test/t/kill_query-6728.test
+++ b/mysql-test/main/kill_query-6728.test
diff --git a/mysql-test/r/last_value.result b/mysql-test/main/last_value.result
index 4849effca12..4849effca12 100644
--- a/mysql-test/r/last_value.result
+++ b/mysql-test/main/last_value.result
diff --git a/mysql-test/t/last_value.test b/mysql-test/main/last_value.test
index 41cfdb5482d..41cfdb5482d 100644
--- a/mysql-test/t/last_value.test
+++ b/mysql-test/main/last_value.test
diff --git a/mysql-test/r/limit.result b/mysql-test/main/limit.result
index 064fa5a18a7..064fa5a18a7 100644
--- a/mysql-test/r/limit.result
+++ b/mysql-test/main/limit.result
diff --git a/mysql-test/t/limit.test b/mysql-test/main/limit.test
index 4dbe13096d4..4dbe13096d4 100644
--- a/mysql-test/t/limit.test
+++ b/mysql-test/main/limit.test
diff --git a/mysql-test/r/limit_rows_examined.result b/mysql-test/main/limit_rows_examined.result
index 7d1ca948c8b..7d1ca948c8b 100644
--- a/mysql-test/r/limit_rows_examined.result
+++ b/mysql-test/main/limit_rows_examined.result
diff --git a/mysql-test/t/limit_rows_examined.test b/mysql-test/main/limit_rows_examined.test
index 815394aec5c..815394aec5c 100644
--- a/mysql-test/t/limit_rows_examined.test
+++ b/mysql-test/main/limit_rows_examined.test
diff --git a/mysql-test/r/loaddata.result b/mysql-test/main/loaddata.result
index 98b8f2de4a5..98b8f2de4a5 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/main/loaddata.result
diff --git a/mysql-test/t/loaddata.test b/mysql-test/main/loaddata.test
index a283e64d473..a283e64d473 100644
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/main/loaddata.test
diff --git a/mysql-test/r/loaddata_autocom_innodb.result b/mysql-test/main/loaddata_autocom_innodb.result
index 9f5a0809f2a..9f5a0809f2a 100644
--- a/mysql-test/r/loaddata_autocom_innodb.result
+++ b/mysql-test/main/loaddata_autocom_innodb.result
diff --git a/mysql-test/t/loaddata_autocom_innodb.test b/mysql-test/main/loaddata_autocom_innodb.test
index d7f152cb286..d7f152cb286 100644
--- a/mysql-test/t/loaddata_autocom_innodb.test
+++ b/mysql-test/main/loaddata_autocom_innodb.test
diff --git a/mysql-test/r/loadxml.result b/mysql-test/main/loadxml.result
index b0fb867a676..b0fb867a676 100644
--- a/mysql-test/r/loadxml.result
+++ b/mysql-test/main/loadxml.result
diff --git a/mysql-test/t/loadxml.test b/mysql-test/main/loadxml.test
index 623deea6ec6..623deea6ec6 100644
--- a/mysql-test/t/loadxml.test
+++ b/mysql-test/main/loadxml.test
diff --git a/mysql-test/r/locale.result b/mysql-test/main/locale.result
index b750d038205..b750d038205 100644
--- a/mysql-test/r/locale.result
+++ b/mysql-test/main/locale.result
diff --git a/mysql-test/t/locale.test b/mysql-test/main/locale.test
index a9a507bc387..a9a507bc387 100644
--- a/mysql-test/t/locale.test
+++ b/mysql-test/main/locale.test
diff --git a/mysql-test/r/lock.result b/mysql-test/main/lock.result
index 00dbb166ffb..00dbb166ffb 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/main/lock.result
diff --git a/mysql-test/t/lock.test b/mysql-test/main/lock.test
index 2e164de9b93..2e164de9b93 100644
--- a/mysql-test/t/lock.test
+++ b/mysql-test/main/lock.test
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/main/lock_multi.result
index d4e0edaf1c2..d4e0edaf1c2 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/main/lock_multi.result
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/main/lock_multi.test
index 51cc4a50233..51cc4a50233 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/main/lock_multi.test
diff --git a/mysql-test/r/lock_multi_bug38499.result b/mysql-test/main/lock_multi_bug38499.result
index 521ea010816..521ea010816 100644
--- a/mysql-test/r/lock_multi_bug38499.result
+++ b/mysql-test/main/lock_multi_bug38499.result
diff --git a/mysql-test/t/lock_multi_bug38499.test b/mysql-test/main/lock_multi_bug38499.test
index b812984e516..b812984e516 100644
--- a/mysql-test/t/lock_multi_bug38499.test
+++ b/mysql-test/main/lock_multi_bug38499.test
diff --git a/mysql-test/r/lock_multi_bug38691.result b/mysql-test/main/lock_multi_bug38691.result
index 55836e161f4..55836e161f4 100644
--- a/mysql-test/r/lock_multi_bug38691.result
+++ b/mysql-test/main/lock_multi_bug38691.result
diff --git a/mysql-test/t/lock_multi_bug38691.test b/mysql-test/main/lock_multi_bug38691.test
index 881a0d8e502..881a0d8e502 100644
--- a/mysql-test/t/lock_multi_bug38691.test
+++ b/mysql-test/main/lock_multi_bug38691.test
diff --git a/mysql-test/t/lock_sync-master.opt b/mysql-test/main/lock_sync-master.opt
index a6700b8d18e..a6700b8d18e 100644
--- a/mysql-test/t/lock_sync-master.opt
+++ b/mysql-test/main/lock_sync-master.opt
diff --git a/mysql-test/r/lock_sync.result b/mysql-test/main/lock_sync.result
index 7b61c5994b6..7b61c5994b6 100644
--- a/mysql-test/r/lock_sync.result
+++ b/mysql-test/main/lock_sync.result
diff --git a/mysql-test/t/lock_sync.test b/mysql-test/main/lock_sync.test
index af8435f7fbb..af8435f7fbb 100644
--- a/mysql-test/t/lock_sync.test
+++ b/mysql-test/main/lock_sync.test
diff --git a/mysql-test/t/lock_tables_lost_commit-master.opt b/mysql-test/main/lock_tables_lost_commit-master.opt
index 51ccb915ef0..51ccb915ef0 100644
--- a/mysql-test/t/lock_tables_lost_commit-master.opt
+++ b/mysql-test/main/lock_tables_lost_commit-master.opt
diff --git a/mysql-test/r/lock_tables_lost_commit.result b/mysql-test/main/lock_tables_lost_commit.result
index 769e9734c7a..769e9734c7a 100644
--- a/mysql-test/r/lock_tables_lost_commit.result
+++ b/mysql-test/main/lock_tables_lost_commit.result
diff --git a/mysql-test/t/lock_tables_lost_commit.test b/mysql-test/main/lock_tables_lost_commit.test
index 754c8f3c378..754c8f3c378 100644
--- a/mysql-test/t/lock_tables_lost_commit.test
+++ b/mysql-test/main/lock_tables_lost_commit.test
diff --git a/mysql-test/r/locked_temporary-5955.result b/mysql-test/main/locked_temporary-5955.result
index ee2a9f499b2..ee2a9f499b2 100644
--- a/mysql-test/r/locked_temporary-5955.result
+++ b/mysql-test/main/locked_temporary-5955.result
diff --git a/mysql-test/t/locked_temporary-5955.test b/mysql-test/main/locked_temporary-5955.test
index 1ade63f4913..1ade63f4913 100644
--- a/mysql-test/t/locked_temporary-5955.test
+++ b/mysql-test/main/locked_temporary-5955.test
diff --git a/mysql-test/r/log_errchk.result b/mysql-test/main/log_errchk.result
index e1968e29662..e1968e29662 100644
--- a/mysql-test/r/log_errchk.result
+++ b/mysql-test/main/log_errchk.result
diff --git a/mysql-test/t/log_errchk.test b/mysql-test/main/log_errchk.test
index 2808458e9f1..2808458e9f1 100644
--- a/mysql-test/t/log_errchk.test
+++ b/mysql-test/main/log_errchk.test
diff --git a/mysql-test/r/log_slow.result b/mysql-test/main/log_slow.result
index 59149633b99..59149633b99 100644
--- a/mysql-test/r/log_slow.result
+++ b/mysql-test/main/log_slow.result
diff --git a/mysql-test/t/log_slow.test b/mysql-test/main/log_slow.test
index 56e35bd5a20..56e35bd5a20 100644
--- a/mysql-test/t/log_slow.test
+++ b/mysql-test/main/log_slow.test
diff --git a/mysql-test/t/log_state-master.opt b/mysql-test/main/log_state-master.opt
index 858bf269a7d..858bf269a7d 100644
--- a/mysql-test/t/log_state-master.opt
+++ b/mysql-test/main/log_state-master.opt
diff --git a/mysql-test/r/log_state.result b/mysql-test/main/log_state.result
index d4f98a6bde9..d4f98a6bde9 100644
--- a/mysql-test/r/log_state.result
+++ b/mysql-test/main/log_state.result
diff --git a/mysql-test/t/log_state.test b/mysql-test/main/log_state.test
index 5a08b8015f0..5a08b8015f0 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/main/log_state.test
diff --git a/mysql-test/t/log_state_bug33693-master.opt b/mysql-test/main/log_state_bug33693-master.opt
index fa3cf2ef78f..fa3cf2ef78f 100644
--- a/mysql-test/t/log_state_bug33693-master.opt
+++ b/mysql-test/main/log_state_bug33693-master.opt
diff --git a/mysql-test/r/log_state_bug33693.result b/mysql-test/main/log_state_bug33693.result
index abf20fc7aa7..abf20fc7aa7 100644
--- a/mysql-test/r/log_state_bug33693.result
+++ b/mysql-test/main/log_state_bug33693.result
diff --git a/mysql-test/t/log_state_bug33693.test b/mysql-test/main/log_state_bug33693.test
index d67b28fc3e9..d67b28fc3e9 100644
--- a/mysql-test/t/log_state_bug33693.test
+++ b/mysql-test/main/log_state_bug33693.test
diff --git a/mysql-test/t/log_tables-big-master.opt b/mysql-test/main/log_tables-big-master.opt
index 0cdf12d284b..0cdf12d284b 100644
--- a/mysql-test/t/log_tables-big-master.opt
+++ b/mysql-test/main/log_tables-big-master.opt
diff --git a/mysql-test/r/log_tables-big.result b/mysql-test/main/log_tables-big.result
index 392a1bce234..392a1bce234 100644
--- a/mysql-test/r/log_tables-big.result
+++ b/mysql-test/main/log_tables-big.result
diff --git a/mysql-test/t/log_tables-big.test b/mysql-test/main/log_tables-big.test
index fa8810ecd3b..fa8810ecd3b 100644
--- a/mysql-test/t/log_tables-big.test
+++ b/mysql-test/main/log_tables-big.test
diff --git a/mysql-test/t/log_tables-master.opt b/mysql-test/main/log_tables-master.opt
index 4c25518cefe..4c25518cefe 100644
--- a/mysql-test/t/log_tables-master.opt
+++ b/mysql-test/main/log_tables-master.opt
diff --git a/mysql-test/r/log_tables.result b/mysql-test/main/log_tables.result
index 126230a8765..126230a8765 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/main/log_tables.result
diff --git a/mysql-test/t/log_tables.test b/mysql-test/main/log_tables.test
index a4158ba6a24..a4158ba6a24 100644
--- a/mysql-test/t/log_tables.test
+++ b/mysql-test/main/log_tables.test
diff --git a/mysql-test/r/log_tables_debug.result b/mysql-test/main/log_tables_debug.result
index 39983339572..39983339572 100644
--- a/mysql-test/r/log_tables_debug.result
+++ b/mysql-test/main/log_tables_debug.result
diff --git a/mysql-test/t/log_tables_debug.test b/mysql-test/main/log_tables_debug.test
index 971c11d458f..971c11d458f 100644
--- a/mysql-test/t/log_tables_debug.test
+++ b/mysql-test/main/log_tables_debug.test
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/main/log_tables_upgrade.result
index 8f822d56020..8f822d56020 100644
--- a/mysql-test/r/log_tables_upgrade.result
+++ b/mysql-test/main/log_tables_upgrade.result
diff --git a/mysql-test/t/log_tables_upgrade.test b/mysql-test/main/log_tables_upgrade.test
index 36802fb38ad..36802fb38ad 100644
--- a/mysql-test/t/log_tables_upgrade.test
+++ b/mysql-test/main/log_tables_upgrade.test
diff --git a/mysql-test/t/long_tmpdir-master.opt b/mysql-test/main/long_tmpdir-master.opt
index 398abfc4632..398abfc4632 100644
--- a/mysql-test/t/long_tmpdir-master.opt
+++ b/mysql-test/main/long_tmpdir-master.opt
diff --git a/mysql-test/t/long_tmpdir-master.sh b/mysql-test/main/long_tmpdir-master.sh
index 318955fbcca..318955fbcca 100644
--- a/mysql-test/t/long_tmpdir-master.sh
+++ b/mysql-test/main/long_tmpdir-master.sh
diff --git a/mysql-test/r/long_tmpdir.result b/mysql-test/main/long_tmpdir.result
index 7e6dd34ced1..7e6dd34ced1 100644
--- a/mysql-test/r/long_tmpdir.result
+++ b/mysql-test/main/long_tmpdir.result
diff --git a/mysql-test/t/long_tmpdir.test b/mysql-test/main/long_tmpdir.test
index cf0bed29918..cf0bed29918 100644
--- a/mysql-test/t/long_tmpdir.test
+++ b/mysql-test/main/long_tmpdir.test
diff --git a/mysql-test/r/lowercase_fs_off.result b/mysql-test/main/lowercase_fs_off.result
index 91bd2924096..91bd2924096 100644
--- a/mysql-test/r/lowercase_fs_off.result
+++ b/mysql-test/main/lowercase_fs_off.result
diff --git a/mysql-test/t/lowercase_fs_off.test b/mysql-test/main/lowercase_fs_off.test
index b8a9795db9a..b8a9795db9a 100644
--- a/mysql-test/t/lowercase_fs_off.test
+++ b/mysql-test/main/lowercase_fs_off.test
diff --git a/mysql-test/r/lowercase_fs_on.result b/mysql-test/main/lowercase_fs_on.result
index ddf3fd5f1fb..ddf3fd5f1fb 100644
--- a/mysql-test/r/lowercase_fs_on.result
+++ b/mysql-test/main/lowercase_fs_on.result
diff --git a/mysql-test/t/lowercase_fs_on.test b/mysql-test/main/lowercase_fs_on.test
index 1d306826e27..1d306826e27 100644
--- a/mysql-test/t/lowercase_fs_on.test
+++ b/mysql-test/main/lowercase_fs_on.test
diff --git a/mysql-test/t/lowercase_mixed_tmpdir-master.opt b/mysql-test/main/lowercase_mixed_tmpdir-master.opt
index 3d21ea72f6b..3d21ea72f6b 100644
--- a/mysql-test/t/lowercase_mixed_tmpdir-master.opt
+++ b/mysql-test/main/lowercase_mixed_tmpdir-master.opt
diff --git a/mysql-test/t/lowercase_mixed_tmpdir-master.sh b/mysql-test/main/lowercase_mixed_tmpdir-master.sh
index 95c26e3aa02..95c26e3aa02 100644
--- a/mysql-test/t/lowercase_mixed_tmpdir-master.sh
+++ b/mysql-test/main/lowercase_mixed_tmpdir-master.sh
diff --git a/mysql-test/r/lowercase_mixed_tmpdir.result b/mysql-test/main/lowercase_mixed_tmpdir.result
index e11b5e4c286..e11b5e4c286 100644
--- a/mysql-test/r/lowercase_mixed_tmpdir.result
+++ b/mysql-test/main/lowercase_mixed_tmpdir.result
diff --git a/mysql-test/t/lowercase_mixed_tmpdir.test b/mysql-test/main/lowercase_mixed_tmpdir.test
index 6bd3a6f2acc..6bd3a6f2acc 100644
--- a/mysql-test/t/lowercase_mixed_tmpdir.test
+++ b/mysql-test/main/lowercase_mixed_tmpdir.test
diff --git a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.opt b/mysql-test/main/lowercase_mixed_tmpdir_innodb-master.opt
index 272f91d629c..272f91d629c 100644
--- a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.opt
+++ b/mysql-test/main/lowercase_mixed_tmpdir_innodb-master.opt
diff --git a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh b/mysql-test/main/lowercase_mixed_tmpdir_innodb-master.sh
index 95c26e3aa02..95c26e3aa02 100644
--- a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh
+++ b/mysql-test/main/lowercase_mixed_tmpdir_innodb-master.sh
diff --git a/mysql-test/r/lowercase_mixed_tmpdir_innodb.result b/mysql-test/main/lowercase_mixed_tmpdir_innodb.result
index a478b49cfda..a478b49cfda 100644
--- a/mysql-test/r/lowercase_mixed_tmpdir_innodb.result
+++ b/mysql-test/main/lowercase_mixed_tmpdir_innodb.result
diff --git a/mysql-test/t/lowercase_mixed_tmpdir_innodb.test b/mysql-test/main/lowercase_mixed_tmpdir_innodb.test
index e3b9b7b2a32..e3b9b7b2a32 100644
--- a/mysql-test/t/lowercase_mixed_tmpdir_innodb.test
+++ b/mysql-test/main/lowercase_mixed_tmpdir_innodb.test
diff --git a/mysql-test/t/lowercase_table-master.opt b/mysql-test/main/lowercase_table-master.opt
index c718e2feb1b..c718e2feb1b 100644
--- a/mysql-test/t/lowercase_table-master.opt
+++ b/mysql-test/main/lowercase_table-master.opt
diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/main/lowercase_table.result
index ac7d3e6bf7b..ac7d3e6bf7b 100644
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/main/lowercase_table.result
diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/main/lowercase_table.test
index c339105aae4..c339105aae4 100644
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/main/lowercase_table.test
diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/main/lowercase_table2.result
index 9194638a4d2..9194638a4d2 100644
--- a/mysql-test/r/lowercase_table2.result
+++ b/mysql-test/main/lowercase_table2.result
diff --git a/mysql-test/t/lowercase_table2.test b/mysql-test/main/lowercase_table2.test
index ec495ac4708..601089ca760 100644
--- a/mysql-test/t/lowercase_table2.test
+++ b/mysql-test/main/lowercase_table2.test
@@ -4,7 +4,7 @@
 # table names)
 #
 --source include/have_innodb.inc
---require r/lowercase2.require
+--require include/lowercase2.require
 disable_query_log;
 show variables like "lower_case_table_names";
 enable_query_log;
diff --git a/mysql-test/t/lowercase_table4-master.opt b/mysql-test/main/lowercase_table4-master.opt
index ac4d3211e89..ac4d3211e89 100644
--- a/mysql-test/t/lowercase_table4-master.opt
+++ b/mysql-test/main/lowercase_table4-master.opt
diff --git a/mysql-test/r/lowercase_table4.result b/mysql-test/main/lowercase_table4.result
index 72c2e9ebf95..72c2e9ebf95 100644
--- a/mysql-test/r/lowercase_table4.result
+++ b/mysql-test/main/lowercase_table4.result
diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/main/lowercase_table4.test
index 981c8a14564..981c8a14564 100644
--- a/mysql-test/t/lowercase_table4.test
+++ b/mysql-test/main/lowercase_table4.test
diff --git a/mysql-test/r/lowercase_table5.result b/mysql-test/main/lowercase_table5.result
index 9adfd0590a8..9adfd0590a8 100644
--- a/mysql-test/r/lowercase_table5.result
+++ b/mysql-test/main/lowercase_table5.result
diff --git a/mysql-test/t/lowercase_table5.test b/mysql-test/main/lowercase_table5.test
index dfdfafcb3da..dfdfafcb3da 100644
--- a/mysql-test/t/lowercase_table5.test
+++ b/mysql-test/main/lowercase_table5.test
diff --git a/mysql-test/t/lowercase_table_grant-master.opt b/mysql-test/main/lowercase_table_grant-master.opt
index c718e2feb1b..c718e2feb1b 100644
--- a/mysql-test/t/lowercase_table_grant-master.opt
+++ b/mysql-test/main/lowercase_table_grant-master.opt
diff --git a/mysql-test/r/lowercase_table_grant.result b/mysql-test/main/lowercase_table_grant.result
index 9ba542ec22d..9ba542ec22d 100644
--- a/mysql-test/r/lowercase_table_grant.result
+++ b/mysql-test/main/lowercase_table_grant.result
diff --git a/mysql-test/t/lowercase_table_grant.test b/mysql-test/main/lowercase_table_grant.test
index 2f98f570e29..2f98f570e29 100644
--- a/mysql-test/t/lowercase_table_grant.test
+++ b/mysql-test/main/lowercase_table_grant.test
diff --git a/mysql-test/t/lowercase_table_qcache-master.opt b/mysql-test/main/lowercase_table_qcache-master.opt
index c718e2feb1b..c718e2feb1b 100644
--- a/mysql-test/t/lowercase_table_qcache-master.opt
+++ b/mysql-test/main/lowercase_table_qcache-master.opt
diff --git a/mysql-test/r/lowercase_table_qcache.result b/mysql-test/main/lowercase_table_qcache.result
index 9d7e1007e4c..9d7e1007e4c 100644
--- a/mysql-test/r/lowercase_table_qcache.result
+++ b/mysql-test/main/lowercase_table_qcache.result
diff --git a/mysql-test/t/lowercase_table_qcache.test b/mysql-test/main/lowercase_table_qcache.test
index ab05755bec1..ab05755bec1 100644
--- a/mysql-test/t/lowercase_table_qcache.test
+++ b/mysql-test/main/lowercase_table_qcache.test
diff --git a/mysql-test/t/lowercase_utf8-master.opt b/mysql-test/main/lowercase_utf8-master.opt
index 1b70aa33023..1b70aa33023 100644
--- a/mysql-test/t/lowercase_utf8-master.opt
+++ b/mysql-test/main/lowercase_utf8-master.opt
diff --git a/mysql-test/r/lowercase_utf8.result b/mysql-test/main/lowercase_utf8.result
index 043226e1f64..043226e1f64 100644
--- a/mysql-test/r/lowercase_utf8.result
+++ b/mysql-test/main/lowercase_utf8.result
diff --git a/mysql-test/t/lowercase_utf8.test b/mysql-test/main/lowercase_utf8.test
index 01b154598fd..01b154598fd 100644
--- a/mysql-test/t/lowercase_utf8.test
+++ b/mysql-test/main/lowercase_utf8.test
diff --git a/mysql-test/t/lowercase_view-master.opt b/mysql-test/main/lowercase_view-master.opt
index 62ab6dad1e0..62ab6dad1e0 100644
--- a/mysql-test/t/lowercase_view-master.opt
+++ b/mysql-test/main/lowercase_view-master.opt
diff --git a/mysql-test/r/lowercase_view.result b/mysql-test/main/lowercase_view.result
index af53f67869d..af53f67869d 100644
--- a/mysql-test/r/lowercase_view.result
+++ b/mysql-test/main/lowercase_view.result
diff --git a/mysql-test/t/lowercase_view.test b/mysql-test/main/lowercase_view.test
index cdd0256d639..cdd0256d639 100644
--- a/mysql-test/t/lowercase_view.test
+++ b/mysql-test/main/lowercase_view.test
diff --git a/mysql-test/r/max_statement_time.result b/mysql-test/main/max_statement_time.result
index 44ee03b813a..44ee03b813a 100644
--- a/mysql-test/r/max_statement_time.result
+++ b/mysql-test/main/max_statement_time.result
diff --git a/mysql-test/t/max_statement_time.test b/mysql-test/main/max_statement_time.test
index 0882daff139..0882daff139 100644
--- a/mysql-test/t/max_statement_time.test
+++ b/mysql-test/main/max_statement_time.test
diff --git a/mysql-test/r/mdev-504.result b/mysql-test/main/mdev-504.result
index 9b8b6795e0f..9b8b6795e0f 100644
--- a/mysql-test/r/mdev-504.result
+++ b/mysql-test/main/mdev-504.result
diff --git a/mysql-test/t/mdev-504.test b/mysql-test/main/mdev-504.test
index 551c21c37d0..551c21c37d0 100644
--- a/mysql-test/t/mdev-504.test
+++ b/mysql-test/main/mdev-504.test
diff --git a/mysql-test/r/mdev13607.result b/mysql-test/main/mdev13607.result
index 08848bc645b..08848bc645b 100644
--- a/mysql-test/r/mdev13607.result
+++ b/mysql-test/main/mdev13607.result
diff --git a/mysql-test/t/mdev13607.test b/mysql-test/main/mdev13607.test
index 45fdb0a74d4..45fdb0a74d4 100644
--- a/mysql-test/t/mdev13607.test
+++ b/mysql-test/main/mdev13607.test
diff --git a/mysql-test/r/mdev316.result b/mysql-test/main/mdev316.result
index 43082769872..43082769872 100644
--- a/mysql-test/r/mdev316.result
+++ b/mysql-test/main/mdev316.result
diff --git a/mysql-test/t/mdev316.test b/mysql-test/main/mdev316.test
index 5843b06a60e..5843b06a60e 100644
--- a/mysql-test/t/mdev316.test
+++ b/mysql-test/main/mdev316.test
diff --git a/mysql-test/r/mdev375.result b/mysql-test/main/mdev375.result
index d7a66ebd6dd..d7a66ebd6dd 100644
--- a/mysql-test/r/mdev375.result
+++ b/mysql-test/main/mdev375.result
diff --git a/mysql-test/t/mdev375.test b/mysql-test/main/mdev375.test
index 92e403b6513..92e403b6513 100644
--- a/mysql-test/t/mdev375.test
+++ b/mysql-test/main/mdev375.test
diff --git a/mysql-test/r/mdev6830.result b/mysql-test/main/mdev6830.result
index d1cf8c98ac1..d1cf8c98ac1 100644
--- a/mysql-test/r/mdev6830.result
+++ b/mysql-test/main/mdev6830.result
diff --git a/mysql-test/t/mdev6830.test b/mysql-test/main/mdev6830.test
index 3898d5bbef6..3898d5bbef6 100644
--- a/mysql-test/t/mdev6830.test
+++ b/mysql-test/main/mdev6830.test
diff --git a/mysql-test/r/mdev_14586.result b/mysql-test/main/mdev_14586.result
index f6c2095d3cd..f6c2095d3cd 100644
--- a/mysql-test/r/mdev_14586.result
+++ b/mysql-test/main/mdev_14586.result
diff --git a/mysql-test/t/mdev_14586.test b/mysql-test/main/mdev_14586.test
index 8b3d3780151..8b3d3780151 100644
--- a/mysql-test/t/mdev_14586.test
+++ b/mysql-test/main/mdev_14586.test
diff --git a/mysql-test/r/mdl.result b/mysql-test/main/mdl.result
index d93bfd5c729..d93bfd5c729 100644
--- a/mysql-test/r/mdl.result
+++ b/mysql-test/main/mdl.result
diff --git a/mysql-test/t/mdl.test b/mysql-test/main/mdl.test
index b90c74a8f7f..b90c74a8f7f 100644
--- a/mysql-test/t/mdl.test
+++ b/mysql-test/main/mdl.test
diff --git a/mysql-test/t/mdl_sync-master.opt b/mysql-test/main/mdl_sync-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/mdl_sync-master.opt
+++ b/mysql-test/main/mdl_sync-master.opt
diff --git a/mysql-test/r/mdl_sync.result b/mysql-test/main/mdl_sync.result
index 3880fc5ef91..3880fc5ef91 100644
--- a/mysql-test/r/mdl_sync.result
+++ b/mysql-test/main/mdl_sync.result
diff --git a/mysql-test/t/mdl_sync.test b/mysql-test/main/mdl_sync.test
index fbecd6bf547..fbecd6bf547 100644
--- a/mysql-test/t/mdl_sync.test
+++ b/mysql-test/main/mdl_sync.test
diff --git a/mysql-test/r/merge-big.result b/mysql-test/main/merge-big.result
index 3b6e116986e..3b6e116986e 100644
--- a/mysql-test/r/merge-big.result
+++ b/mysql-test/main/merge-big.result
diff --git a/mysql-test/t/merge-big.test b/mysql-test/main/merge-big.test
index 9bd2cab2c8a..9bd2cab2c8a 100644
--- a/mysql-test/t/merge-big.test
+++ b/mysql-test/main/merge-big.test
diff --git a/mysql-test/r/merge.result b/mysql-test/main/merge.result
index ff6bdf4a07e..ff6bdf4a07e 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/main/merge.result
diff --git a/mysql-test/t/merge.test b/mysql-test/main/merge.test
index edc4a364ad9..edc4a364ad9 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/main/merge.test
diff --git a/mysql-test/r/merge_debug.result b/mysql-test/main/merge_debug.result
index 51905e52d24..51905e52d24 100644
--- a/mysql-test/r/merge_debug.result
+++ b/mysql-test/main/merge_debug.result
diff --git a/mysql-test/t/merge_debug.test b/mysql-test/main/merge_debug.test
index 3c617cfc545..3c617cfc545 100644
--- a/mysql-test/t/merge_debug.test
+++ b/mysql-test/main/merge_debug.test
diff --git a/mysql-test/r/merge_innodb.result b/mysql-test/main/merge_innodb.result
index 5aa344a9391..5aa344a9391 100644
--- a/mysql-test/r/merge_innodb.result
+++ b/mysql-test/main/merge_innodb.result
diff --git a/mysql-test/t/merge_innodb.test b/mysql-test/main/merge_innodb.test
index 9f87f241d00..9f87f241d00 100644
--- a/mysql-test/t/merge_innodb.test
+++ b/mysql-test/main/merge_innodb.test
diff --git a/mysql-test/t/merge_mmap-master.opt b/mysql-test/main/merge_mmap-master.opt
index 9606fb57187..9606fb57187 100644
--- a/mysql-test/t/merge_mmap-master.opt
+++ b/mysql-test/main/merge_mmap-master.opt
diff --git a/mysql-test/r/merge_mmap.result b/mysql-test/main/merge_mmap.result
index e8014259a4a..e8014259a4a 100644
--- a/mysql-test/r/merge_mmap.result
+++ b/mysql-test/main/merge_mmap.result
diff --git a/mysql-test/t/merge_mmap.test b/mysql-test/main/merge_mmap.test
index c97b029754d..c97b029754d 100644
--- a/mysql-test/t/merge_mmap.test
+++ b/mysql-test/main/merge_mmap.test
diff --git a/mysql-test/r/metadata.result b/mysql-test/main/metadata.result
index 7848390b62e..7848390b62e 100644
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/main/metadata.result
diff --git a/mysql-test/t/metadata.test b/mysql-test/main/metadata.test
index 96189a9750a..96189a9750a 100644
--- a/mysql-test/t/metadata.test
+++ b/mysql-test/main/metadata.test
diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/main/mix2_myisam.result
index 34764466d2a..34764466d2a 100644
--- a/mysql-test/r/mix2_myisam.result
+++ b/mysql-test/main/mix2_myisam.result
diff --git a/mysql-test/t/mix2_myisam.test b/mysql-test/main/mix2_myisam.test
index 97195130967..97195130967 100644
--- a/mysql-test/t/mix2_myisam.test
+++ b/mysql-test/main/mix2_myisam.test
diff --git a/mysql-test/r/mix2_myisam_ucs2.result b/mysql-test/main/mix2_myisam_ucs2.result
index 830d3b87eb5..830d3b87eb5 100644
--- a/mysql-test/r/mix2_myisam_ucs2.result
+++ b/mysql-test/main/mix2_myisam_ucs2.result
diff --git a/mysql-test/t/mix2_myisam_ucs2.test b/mysql-test/main/mix2_myisam_ucs2.test
index fe22fa50238..fe22fa50238 100644
--- a/mysql-test/t/mix2_myisam_ucs2.test
+++ b/mysql-test/main/mix2_myisam_ucs2.test
diff --git a/mysql-test/r/mrr_derived_crash_4610.result b/mysql-test/main/mrr_derived_crash_4610.result
index 3e38a0d4218..3e38a0d4218 100644
--- a/mysql-test/r/mrr_derived_crash_4610.result
+++ b/mysql-test/main/mrr_derived_crash_4610.result
diff --git a/mysql-test/t/mrr_derived_crash_4610.test b/mysql-test/main/mrr_derived_crash_4610.test
index 88882b57cf7..88882b57cf7 100644
--- a/mysql-test/t/mrr_derived_crash_4610.test
+++ b/mysql-test/main/mrr_derived_crash_4610.test
diff --git a/mysql-test/r/mrr_icp_extra.result b/mysql-test/main/mrr_icp_extra.result
index 95788b393dd..95788b393dd 100644
--- a/mysql-test/r/mrr_icp_extra.result
+++ b/mysql-test/main/mrr_icp_extra.result
diff --git a/mysql-test/t/mrr_icp_extra.test b/mysql-test/main/mrr_icp_extra.test
index 75ddc85b984..75ddc85b984 100644
--- a/mysql-test/t/mrr_icp_extra.test
+++ b/mysql-test/main/mrr_icp_extra.test
diff --git a/mysql-test/t/multi_statement-master.opt b/mysql-test/main/multi_statement-master.opt
index c735cf4c21b..c735cf4c21b 100644
--- a/mysql-test/t/multi_statement-master.opt
+++ b/mysql-test/main/multi_statement-master.opt
diff --git a/mysql-test/r/multi_statement.result b/mysql-test/main/multi_statement.result
index ff19cbdd698..ff19cbdd698 100644
--- a/mysql-test/r/multi_statement.result
+++ b/mysql-test/main/multi_statement.result
diff --git a/mysql-test/t/multi_statement.test b/mysql-test/main/multi_statement.test
index 785aa749f5e..785aa749f5e 100644
--- a/mysql-test/t/multi_statement.test
+++ b/mysql-test/main/multi_statement.test
diff --git a/mysql-test/t/multi_update-master.opt b/mysql-test/main/multi_update-master.opt
index da78f987af3..da78f987af3 100644
--- a/mysql-test/t/multi_update-master.opt
+++ b/mysql-test/main/multi_update-master.opt
diff --git a/mysql-test/r/multi_update.result b/mysql-test/main/multi_update.result
index 45239f6e090..45239f6e090 100644
--- a/mysql-test/r/multi_update.result
+++ b/mysql-test/main/multi_update.result
diff --git a/mysql-test/t/multi_update.test b/mysql-test/main/multi_update.test
index 5feebe87a5a..5feebe87a5a 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/main/multi_update.test
diff --git a/mysql-test/t/multi_update2-master.opt b/mysql-test/main/multi_update2-master.opt
index da78f987af3..da78f987af3 100644
--- a/mysql-test/t/multi_update2-master.opt
+++ b/mysql-test/main/multi_update2-master.opt
diff --git a/mysql-test/r/multi_update2.result b/mysql-test/main/multi_update2.result
index 3712e638f40..3712e638f40 100644
--- a/mysql-test/r/multi_update2.result
+++ b/mysql-test/main/multi_update2.result
diff --git a/mysql-test/t/multi_update2.test b/mysql-test/main/multi_update2.test
index a0f17fabec4..a0f17fabec4 100644
--- a/mysql-test/t/multi_update2.test
+++ b/mysql-test/main/multi_update2.test
diff --git a/mysql-test/r/multi_update_binlog.result b/mysql-test/main/multi_update_binlog.result
index e77a4530dbf..e77a4530dbf 100644
--- a/mysql-test/r/multi_update_binlog.result
+++ b/mysql-test/main/multi_update_binlog.result
diff --git a/mysql-test/t/multi_update_binlog.test b/mysql-test/main/multi_update_binlog.test
index 16155aa1af3..16155aa1af3 100644
--- a/mysql-test/t/multi_update_binlog.test
+++ b/mysql-test/main/multi_update_binlog.test
diff --git a/mysql-test/r/multi_update_innodb.result b/mysql-test/main/multi_update_innodb.result
index 5890fd24f5f..5890fd24f5f 100644
--- a/mysql-test/r/multi_update_innodb.result
+++ b/mysql-test/main/multi_update_innodb.result
diff --git a/mysql-test/t/multi_update_innodb.test b/mysql-test/main/multi_update_innodb.test
index f5f8f91edb8..f5f8f91edb8 100644
--- a/mysql-test/t/multi_update_innodb.test
+++ b/mysql-test/main/multi_update_innodb.test
diff --git a/mysql-test/t/multi_update_tiny_hash-master.opt b/mysql-test/main/multi_update_tiny_hash-master.opt
index 2fa4c2b903d..2fa4c2b903d 100644
--- a/mysql-test/t/multi_update_tiny_hash-master.opt
+++ b/mysql-test/main/multi_update_tiny_hash-master.opt
diff --git a/mysql-test/r/multi_update_tiny_hash.result b/mysql-test/main/multi_update_tiny_hash.result
index d8983123aac..d8983123aac 100644
--- a/mysql-test/r/multi_update_tiny_hash.result
+++ b/mysql-test/main/multi_update_tiny_hash.result
diff --git a/mysql-test/t/multi_update_tiny_hash.test b/mysql-test/main/multi_update_tiny_hash.test
index 10d469fb076..10d469fb076 100644
--- a/mysql-test/t/multi_update_tiny_hash.test
+++ b/mysql-test/main/multi_update_tiny_hash.test
diff --git a/mysql-test/r/myisam-big.result b/mysql-test/main/myisam-big.result
index fd0bcb1224b..fd0bcb1224b 100644
--- a/mysql-test/r/myisam-big.result
+++ b/mysql-test/main/myisam-big.result
diff --git a/mysql-test/t/myisam-big.test b/mysql-test/main/myisam-big.test
index 2fec2450ecd..2fec2450ecd 100644
--- a/mysql-test/t/myisam-big.test
+++ b/mysql-test/main/myisam-big.test
diff --git a/mysql-test/t/myisam-blob-master.opt b/mysql-test/main/myisam-blob-master.opt
index ededac33ec7..ededac33ec7 100644
--- a/mysql-test/t/myisam-blob-master.opt
+++ b/mysql-test/main/myisam-blob-master.opt
diff --git a/mysql-test/r/myisam-blob.result b/mysql-test/main/myisam-blob.result
index 46be1bdbd49..46be1bdbd49 100644
--- a/mysql-test/r/myisam-blob.result
+++ b/mysql-test/main/myisam-blob.result
diff --git a/mysql-test/t/myisam-blob.test b/mysql-test/main/myisam-blob.test
index 23de8d54ee7..23de8d54ee7 100644
--- a/mysql-test/t/myisam-blob.test
+++ b/mysql-test/main/myisam-blob.test
diff --git a/mysql-test/t/myisam-master.opt b/mysql-test/main/myisam-master.opt
index c5f16ccfd5b..c5f16ccfd5b 100644
--- a/mysql-test/t/myisam-master.opt
+++ b/mysql-test/main/myisam-master.opt
diff --git a/mysql-test/r/myisam-optimize.result b/mysql-test/main/myisam-optimize.result
index 9de3c24301f..9de3c24301f 100644
--- a/mysql-test/r/myisam-optimize.result
+++ b/mysql-test/main/myisam-optimize.result
diff --git a/mysql-test/t/myisam-optimize.test b/mysql-test/main/myisam-optimize.test
index 7c1fe4ec1c8..7c1fe4ec1c8 100644
--- a/mysql-test/t/myisam-optimize.test
+++ b/mysql-test/main/myisam-optimize.test
diff --git a/mysql-test/r/myisam-system.result b/mysql-test/main/myisam-system.result
index e489f87948a..e489f87948a 100644
--- a/mysql-test/r/myisam-system.result
+++ b/mysql-test/main/myisam-system.result
diff --git a/mysql-test/t/myisam-system.test b/mysql-test/main/myisam-system.test
index cece33bb00b..cece33bb00b 100644
--- a/mysql-test/t/myisam-system.test
+++ b/mysql-test/main/myisam-system.test
diff --git a/mysql-test/r/myisam.result b/mysql-test/main/myisam.result
index cbc475cfd8a..cbc475cfd8a 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/main/myisam.result
diff --git a/mysql-test/t/myisam.test b/mysql-test/main/myisam.test
index 24f3ff783c9..24f3ff783c9 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/main/myisam.test
diff --git a/mysql-test/t/myisam_crash_before_flush_keys-master.opt b/mysql-test/main/myisam_crash_before_flush_keys-master.opt
index 425fda95086..425fda95086 100644
--- a/mysql-test/t/myisam_crash_before_flush_keys-master.opt
+++ b/mysql-test/main/myisam_crash_before_flush_keys-master.opt
diff --git a/mysql-test/r/myisam_crash_before_flush_keys.result b/mysql-test/main/myisam_crash_before_flush_keys.result
index 7d929ffb644..7d929ffb644 100644
--- a/mysql-test/r/myisam_crash_before_flush_keys.result
+++ b/mysql-test/main/myisam_crash_before_flush_keys.result
diff --git a/mysql-test/t/myisam_crash_before_flush_keys.test b/mysql-test/main/myisam_crash_before_flush_keys.test
index 8df81f73ec0..8df81f73ec0 100644
--- a/mysql-test/t/myisam_crash_before_flush_keys.test
+++ b/mysql-test/main/myisam_crash_before_flush_keys.test
diff --git a/mysql-test/r/myisam_debug.result b/mysql-test/main/myisam_debug.result
index 6232e3eac0e..6232e3eac0e 100644
--- a/mysql-test/r/myisam_debug.result
+++ b/mysql-test/main/myisam_debug.result
diff --git a/mysql-test/t/myisam_debug.test b/mysql-test/main/myisam_debug.test
index 465ecd70895..465ecd70895 100644
--- a/mysql-test/t/myisam_debug.test
+++ b/mysql-test/main/myisam_debug.test
diff --git a/mysql-test/r/myisam_enable_keys-10506.result b/mysql-test/main/myisam_enable_keys-10506.result
index 77a5ba8a6ea..77a5ba8a6ea 100644
--- a/mysql-test/r/myisam_enable_keys-10506.result
+++ b/mysql-test/main/myisam_enable_keys-10506.result
diff --git a/mysql-test/t/myisam_enable_keys-10506.test b/mysql-test/main/myisam_enable_keys-10506.test
index 33eb973c402..33eb973c402 100644
--- a/mysql-test/t/myisam_enable_keys-10506.test
+++ b/mysql-test/main/myisam_enable_keys-10506.test
diff --git a/mysql-test/r/myisam_explain_non_select_all.result b/mysql-test/main/myisam_explain_non_select_all.result
index 09e662f5d6a..09e662f5d6a 100644
--- a/mysql-test/r/myisam_explain_non_select_all.result
+++ b/mysql-test/main/myisam_explain_non_select_all.result
diff --git a/mysql-test/t/myisam_explain_non_select_all.test b/mysql-test/main/myisam_explain_non_select_all.test
index ccd4ebd6297..ccd4ebd6297 100644
--- a/mysql-test/t/myisam_explain_non_select_all.test
+++ b/mysql-test/main/myisam_explain_non_select_all.test
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/main/myisam_icp.result
index 6a70521cd72..6a70521cd72 100644
--- a/mysql-test/r/myisam_icp.result
+++ b/mysql-test/main/myisam_icp.result
diff --git a/mysql-test/t/myisam_icp.test b/mysql-test/main/myisam_icp.test
index 508c282b1dc..508c282b1dc 100644
--- a/mysql-test/t/myisam_icp.test
+++ b/mysql-test/main/myisam_icp.test
diff --git a/mysql-test/r/myisam_icp_notembedded.result b/mysql-test/main/myisam_icp_notembedded.result
index 789259d62f1..789259d62f1 100644
--- a/mysql-test/r/myisam_icp_notembedded.result
+++ b/mysql-test/main/myisam_icp_notembedded.result
diff --git a/mysql-test/t/myisam_icp_notembedded.test b/mysql-test/main/myisam_icp_notembedded.test
index 139a9edf648..139a9edf648 100644
--- a/mysql-test/t/myisam_icp_notembedded.test
+++ b/mysql-test/main/myisam_icp_notembedded.test
diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/main/myisam_mrr.result
index 511e6a8d01f..511e6a8d01f 100644
--- a/mysql-test/r/myisam_mrr.result
+++ b/mysql-test/main/myisam_mrr.result
diff --git a/mysql-test/t/myisam_mrr.test b/mysql-test/main/myisam_mrr.test
index b15fdf60ce7..b15fdf60ce7 100644
--- a/mysql-test/t/myisam_mrr.test
+++ b/mysql-test/main/myisam_mrr.test
diff --git a/mysql-test/r/myisam_optimize.result b/mysql-test/main/myisam_optimize.result
index f71d524fadb..f71d524fadb 100644
--- a/mysql-test/r/myisam_optimize.result
+++ b/mysql-test/main/myisam_optimize.result
diff --git a/mysql-test/t/myisam_optimize.test b/mysql-test/main/myisam_optimize.test
index 5e133aea853..5e133aea853 100644
--- a/mysql-test/t/myisam_optimize.test
+++ b/mysql-test/main/myisam_optimize.test
diff --git a/mysql-test/t/myisam_recover-master.opt b/mysql-test/main/myisam_recover-master.opt
index fca5ea079e3..fca5ea079e3 100644
--- a/mysql-test/t/myisam_recover-master.opt
+++ b/mysql-test/main/myisam_recover-master.opt
diff --git a/mysql-test/r/myisam_recover.result b/mysql-test/main/myisam_recover.result
index 12184ad0ca6..12184ad0ca6 100644
--- a/mysql-test/r/myisam_recover.result
+++ b/mysql-test/main/myisam_recover.result
diff --git a/mysql-test/t/myisam_recover.test b/mysql-test/main/myisam_recover.test
index 86a4d16d0f9..86a4d16d0f9 100644
--- a/mysql-test/t/myisam_recover.test
+++ b/mysql-test/main/myisam_recover.test
diff --git a/mysql-test/r/myisampack.result b/mysql-test/main/myisampack.result
index 13321695360..13321695360 100644
--- a/mysql-test/r/myisampack.result
+++ b/mysql-test/main/myisampack.result
diff --git a/mysql-test/t/myisampack.test b/mysql-test/main/myisampack.test
index 1f97a28e6fd..1f97a28e6fd 100644
--- a/mysql-test/t/myisampack.test
+++ b/mysql-test/main/myisampack.test
diff --git a/mysql-test/r/mysql-bug41486.result b/mysql-test/main/mysql-bug41486.result
index d5760dcb1b9..d5760dcb1b9 100644
--- a/mysql-test/r/mysql-bug41486.result
+++ b/mysql-test/main/mysql-bug41486.result
diff --git a/mysql-test/t/mysql-bug41486.test b/mysql-test/main/mysql-bug41486.test
index e7b0acc1935..e7b0acc1935 100644
--- a/mysql-test/t/mysql-bug41486.test
+++ b/mysql-test/main/mysql-bug41486.test
diff --git a/mysql-test/r/mysql-bug45236.result b/mysql-test/main/mysql-bug45236.result
index c1e41d62b63..c1e41d62b63 100644
--- a/mysql-test/r/mysql-bug45236.result
+++ b/mysql-test/main/mysql-bug45236.result
diff --git a/mysql-test/t/mysql-bug45236.test b/mysql-test/main/mysql-bug45236.test
index efc10ed19ea..efc10ed19ea 100644
--- a/mysql-test/t/mysql-bug45236.test
+++ b/mysql-test/main/mysql-bug45236.test
diff --git a/mysql-test/r/mysql.result b/mysql-test/main/mysql.result
index 09f014da627..09f014da627 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/main/mysql.result
diff --git a/mysql-test/t/mysql.test b/mysql-test/main/mysql.test
index 300695612fd..022a24ce25e 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/main/mysql.test
@@ -19,7 +19,7 @@ create table t1(a int);
 insert into t1 values(1);
 
 # Test delimiters
---exec $MYSQL test 2>&1 < "./t/mysql_delimiter.sql"
+--exec $MYSQL test 2>&1 < "./main/mysql_delimiter.sql"
 
 --disable_query_log
 # Test delimiter : supplied on the command line
diff --git a/mysql-test/r/mysql5613mysql.result b/mysql-test/main/mysql5613mysql.result
index 183af7211d3..183af7211d3 100644
--- a/mysql-test/r/mysql5613mysql.result
+++ b/mysql-test/main/mysql5613mysql.result
diff --git a/mysql-test/t/mysql5613mysql.test b/mysql-test/main/mysql5613mysql.test
index c4baf6ca166..c4baf6ca166 100644
--- a/mysql-test/t/mysql5613mysql.test
+++ b/mysql-test/main/mysql5613mysql.test
diff --git a/mysql-test/r/mysql57_virtual.result b/mysql-test/main/mysql57_virtual.result
index 8186aa7cdec..8186aa7cdec 100644
--- a/mysql-test/r/mysql57_virtual.result
+++ b/mysql-test/main/mysql57_virtual.result
diff --git a/mysql-test/t/mysql57_virtual.test b/mysql-test/main/mysql57_virtual.test
index 3ebdd894b79..3ebdd894b79 100644
--- a/mysql-test/t/mysql57_virtual.test
+++ b/mysql-test/main/mysql57_virtual.test
diff --git a/mysql-test/r/mysql_binary_mode.result b/mysql-test/main/mysql_binary_mode.result
index cb230037108..cb230037108 100644
--- a/mysql-test/r/mysql_binary_mode.result
+++ b/mysql-test/main/mysql_binary_mode.result
diff --git a/mysql-test/t/mysql_binary_mode.test b/mysql-test/main/mysql_binary_mode.test
index d454bfb7624..d454bfb7624 100644
--- a/mysql-test/t/mysql_binary_mode.test
+++ b/mysql-test/main/mysql_binary_mode.test
diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/main/mysql_client_test-master.opt
index 8d49abf6a10..8d49abf6a10 100644
--- a/mysql-test/t/mysql_client_test-master.opt
+++ b/mysql-test/main/mysql_client_test-master.opt
diff --git a/mysql-test/r/mysql_client_test.result b/mysql-test/main/mysql_client_test.result
index 83ef8d442b3..83ef8d442b3 100644
--- a/mysql-test/r/mysql_client_test.result
+++ b/mysql-test/main/mysql_client_test.result
diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/main/mysql_client_test.test
index 260473aa0d0..260473aa0d0 100644
--- a/mysql-test/t/mysql_client_test.test
+++ b/mysql-test/main/mysql_client_test.test
diff --git a/mysql-test/t/mysql_client_test_comp-master.opt b/mysql-test/main/mysql_client_test_comp-master.opt
index 6c4a5e4c782..6c4a5e4c782 100644
--- a/mysql-test/t/mysql_client_test_comp-master.opt
+++ b/mysql-test/main/mysql_client_test_comp-master.opt
diff --git a/mysql-test/r/mysql_client_test_comp.result b/mysql-test/main/mysql_client_test_comp.result
index 096331db4f1..096331db4f1 100644
--- a/mysql-test/r/mysql_client_test_comp.result
+++ b/mysql-test/main/mysql_client_test_comp.result
diff --git a/mysql-test/t/mysql_client_test_comp.test b/mysql-test/main/mysql_client_test_comp.test
index 13a9d4944a4..13a9d4944a4 100644
--- a/mysql-test/t/mysql_client_test_comp.test
+++ b/mysql-test/main/mysql_client_test_comp.test
diff --git a/mysql-test/t/mysql_client_test_nonblock-master.opt b/mysql-test/main/mysql_client_test_nonblock-master.opt
index a39d0089562..a39d0089562 100644
--- a/mysql-test/t/mysql_client_test_nonblock-master.opt
+++ b/mysql-test/main/mysql_client_test_nonblock-master.opt
diff --git a/mysql-test/r/mysql_client_test_nonblock.result b/mysql-test/main/mysql_client_test_nonblock.result
index 391794f082f..391794f082f 100644
--- a/mysql-test/r/mysql_client_test_nonblock.result
+++ b/mysql-test/main/mysql_client_test_nonblock.result
diff --git a/mysql-test/t/mysql_client_test_nonblock.test b/mysql-test/main/mysql_client_test_nonblock.test
index 31de14e4178..31de14e4178 100644
--- a/mysql-test/t/mysql_client_test_nonblock.test
+++ b/mysql-test/main/mysql_client_test_nonblock.test
diff --git a/mysql-test/r/mysql_comments.result b/mysql-test/main/mysql_comments.result
index 9ba8dff3d55..9ba8dff3d55 100644
--- a/mysql-test/r/mysql_comments.result
+++ b/mysql-test/main/mysql_comments.result
diff --git a/mysql-test/t/mysql_comments.sql b/mysql-test/main/mysql_comments.sql
index 2497c35e465..2497c35e465 100644
--- a/mysql-test/t/mysql_comments.sql
+++ b/mysql-test/main/mysql_comments.sql
diff --git a/mysql-test/t/mysql_comments.test b/mysql-test/main/mysql_comments.test
index fb0e5f94950..338fe8dc6b9 100644
--- a/mysql-test/t/mysql_comments.test
+++ b/mysql-test/main/mysql_comments.test
@@ -31,12 +31,12 @@ drop trigger if exists t1_bi;
 # Test without comments
 --echo "Pass 1 : --disable-comments"
 --replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]{2})*/--TIME--/
---exec $MYSQL --disable-comments test 2>&1 < "./t/mysql_comments.sql"
+--exec $MYSQL --disable-comments test 2>&1 < "./main/mysql_comments.sql"
 
 # Test with comments
 --echo "Pass 2 : --enable-comments"
 --replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]{2})*/--TIME--/
---exec $MYSQL --enable-comments test 2>&1 < "./t/mysql_comments.sql"
+--exec $MYSQL --enable-comments test 2>&1 < "./main/mysql_comments.sql"
 
 
 set global sql_mode=default;
diff --git a/mysql-test/r/mysql_cp932.result b/mysql-test/main/mysql_cp932.result
index e15c97720cd..e15c97720cd 100644
--- a/mysql-test/r/mysql_cp932.result
+++ b/mysql-test/main/mysql_cp932.result
diff --git a/mysql-test/t/mysql_cp932.test b/mysql-test/main/mysql_cp932.test
index 60a129c3805..60a129c3805 100644
--- a/mysql-test/t/mysql_cp932.test
+++ b/mysql-test/main/mysql_cp932.test
diff --git a/mysql-test/t/mysql_delimiter.sql b/mysql-test/main/mysql_delimiter.sql
index 533ac2ce093..048d4008f92 100644
--- a/mysql-test/t/mysql_delimiter.sql
+++ b/mysql-test/main/mysql_delimiter.sql
@@ -48,14 +48,14 @@ delimiter ; # Reset delimiter
 #
 # Bug #11523: \d works differently than delimiter
 #
-source t/mysql_delimiter_source.sql
+source ./main/mysql_delimiter_source.sql
 delimiter ; # Reset delimiter
 
 #
 # Bug #19799: delimiter command not working correctly when sourcing a sql file
 #             with Windows style line endings.
 #
-source t/mysql_delimiter_19799.sql
+source ./main/mysql_delimiter_19799.sql
 use test//
 show tables//
 delimiter ; # Reset delimiter
diff --git a/mysql-test/t/mysql_delimiter_19799.sql b/mysql-test/main/mysql_delimiter_19799.sql
index 2a3d4378492..2a3d4378492 100644
--- a/mysql-test/t/mysql_delimiter_19799.sql
+++ b/mysql-test/main/mysql_delimiter_19799.sql
diff --git a/mysql-test/t/mysql_delimiter_source.sql b/mysql-test/main/mysql_delimiter_source.sql
index f645091f3d4..f645091f3d4 100644
--- a/mysql-test/t/mysql_delimiter_source.sql
+++ b/mysql-test/main/mysql_delimiter_source.sql
diff --git a/mysql-test/r/mysql_embedded.result b/mysql-test/main/mysql_embedded.result
index 3ba79a01e44..3ba79a01e44 100644
--- a/mysql-test/r/mysql_embedded.result
+++ b/mysql-test/main/mysql_embedded.result
diff --git a/mysql-test/t/mysql_embedded.test b/mysql-test/main/mysql_embedded.test
index 30959b83017..30959b83017 100644
--- a/mysql-test/t/mysql_embedded.test
+++ b/mysql-test/main/mysql_embedded.test
diff --git a/mysql-test/r/mysql_locale_posix.result b/mysql-test/main/mysql_locale_posix.result
index 72a473bb89e..72a473bb89e 100644
--- a/mysql-test/r/mysql_locale_posix.result
+++ b/mysql-test/main/mysql_locale_posix.result
diff --git a/mysql-test/t/mysql_locale_posix.test b/mysql-test/main/mysql_locale_posix.test
index c047b7b1ae9..c047b7b1ae9 100644
--- a/mysql-test/t/mysql_locale_posix.test
+++ b/mysql-test/main/mysql_locale_posix.test
diff --git a/mysql-test/r/mysql_not_windows.result b/mysql-test/main/mysql_not_windows.result
index 1df62d9a12d..1df62d9a12d 100644
--- a/mysql-test/r/mysql_not_windows.result
+++ b/mysql-test/main/mysql_not_windows.result
diff --git a/mysql-test/t/mysql_not_windows.test b/mysql-test/main/mysql_not_windows.test
index 591de74cbbf..591de74cbbf 100644
--- a/mysql-test/t/mysql_not_windows.test
+++ b/mysql-test/main/mysql_not_windows.test
diff --git a/mysql-test/r/mysql_protocols.result b/mysql-test/main/mysql_protocols.result
index c6207c4f4f5..c6207c4f4f5 100644
--- a/mysql-test/r/mysql_protocols.result
+++ b/mysql-test/main/mysql_protocols.result
diff --git a/mysql-test/t/mysql_protocols.test b/mysql-test/main/mysql_protocols.test
index 5eba780420c..5eba780420c 100644
--- a/mysql-test/t/mysql_protocols.test
+++ b/mysql-test/main/mysql_protocols.test
diff --git a/mysql-test/r/mysql_tzinfo_to_sql_symlink.result b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
index 03543244105..03543244105 100644
--- a/mysql-test/r/mysql_tzinfo_to_sql_symlink.result
+++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
diff --git a/mysql-test/t/mysql_tzinfo_to_sql_symlink.test b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
index 8ca82b87e30..8ca82b87e30 100644
--- a/mysql-test/t/mysql_tzinfo_to_sql_symlink.test
+++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
diff --git a/mysql-test/t/mysql_upgrade-6984.opt b/mysql-test/main/mysql_upgrade-6984.opt
index 97669d95260..97669d95260 100644
--- a/mysql-test/t/mysql_upgrade-6984.opt
+++ b/mysql-test/main/mysql_upgrade-6984.opt
diff --git a/mysql-test/r/mysql_upgrade-6984.result b/mysql-test/main/mysql_upgrade-6984.result
index 6c711b4847f..6c711b4847f 100644
--- a/mysql-test/r/mysql_upgrade-6984.result
+++ b/mysql-test/main/mysql_upgrade-6984.result
diff --git a/mysql-test/t/mysql_upgrade-6984.test b/mysql-test/main/mysql_upgrade-6984.test
index 9bbfbeb3f87..9bbfbeb3f87 100644
--- a/mysql-test/t/mysql_upgrade-6984.test
+++ b/mysql-test/main/mysql_upgrade-6984.test
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index 08efe0e8bc8..08efe0e8bc8 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index 0171fe6c7ba..0171fe6c7ba 100644
--- a/mysql-test/t/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
diff --git a/mysql-test/r/mysql_upgrade_no_innodb.result b/mysql-test/main/mysql_upgrade_no_innodb.result
index 8e051bb7c16..8e051bb7c16 100644
--- a/mysql-test/r/mysql_upgrade_no_innodb.result
+++ b/mysql-test/main/mysql_upgrade_no_innodb.result
diff --git a/mysql-test/t/mysql_upgrade_no_innodb.test b/mysql-test/main/mysql_upgrade_no_innodb.test
index 8813a450450..8813a450450 100644
--- a/mysql-test/t/mysql_upgrade_no_innodb.test
+++ b/mysql-test/main/mysql_upgrade_no_innodb.test
diff --git a/mysql-test/r/mysql_upgrade_noengine.result b/mysql-test/main/mysql_upgrade_noengine.result
index 7b3b1610ee0..7b3b1610ee0 100644
--- a/mysql-test/r/mysql_upgrade_noengine.result
+++ b/mysql-test/main/mysql_upgrade_noengine.result
diff --git a/mysql-test/t/mysql_upgrade_noengine.test b/mysql-test/main/mysql_upgrade_noengine.test
index 1d65e7ffa1c..1d65e7ffa1c 100644
--- a/mysql-test/t/mysql_upgrade_noengine.test
+++ b/mysql-test/main/mysql_upgrade_noengine.test
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/main/mysql_upgrade_ssl.result
index 172a1401cdb..172a1401cdb 100644
--- a/mysql-test/r/mysql_upgrade_ssl.result
+++ b/mysql-test/main/mysql_upgrade_ssl.result
diff --git a/mysql-test/t/mysql_upgrade_ssl.test b/mysql-test/main/mysql_upgrade_ssl.test
index daf5fad3df7..daf5fad3df7 100644
--- a/mysql-test/t/mysql_upgrade_ssl.test
+++ b/mysql-test/main/mysql_upgrade_ssl.test
diff --git a/mysql-test/r/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result
index 813138b57a8..813138b57a8 100644
--- a/mysql-test/r/mysql_upgrade_view.result
+++ b/mysql-test/main/mysql_upgrade_view.result
diff --git a/mysql-test/t/mysql_upgrade_view.test b/mysql-test/main/mysql_upgrade_view.test
index 6a496858d22..6a496858d22 100644
--- a/mysql-test/t/mysql_upgrade_view.test
+++ b/mysql-test/main/mysql_upgrade_view.test
diff --git a/mysql-test/r/mysqladmin.result b/mysql-test/main/mysqladmin.result
index 8a9b009946b..8a9b009946b 100644
--- a/mysql-test/r/mysqladmin.result
+++ b/mysql-test/main/mysqladmin.result
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/main/mysqladmin.test
index 2580db88456..2580db88456 100644
--- a/mysql-test/t/mysqladmin.test
+++ b/mysql-test/main/mysqladmin.test
diff --git a/mysql-test/r/mysqlbinlog-innodb.result b/mysql-test/main/mysqlbinlog-innodb.result
index 2971a69fb4d..2971a69fb4d 100644
--- a/mysql-test/r/mysqlbinlog-innodb.result
+++ b/mysql-test/main/mysqlbinlog-innodb.result
diff --git a/mysql-test/t/mysqlbinlog-innodb.test b/mysql-test/main/mysqlbinlog-innodb.test
index c8bf8095705..c8bf8095705 100644
--- a/mysql-test/t/mysqlbinlog-innodb.test
+++ b/mysql-test/main/mysqlbinlog-innodb.test
diff --git a/mysql-test/t/mysqlbinlog-master.opt b/mysql-test/main/mysqlbinlog-master.opt
index ac1a87c73b3..ac1a87c73b3 100644
--- a/mysql-test/t/mysqlbinlog-master.opt
+++ b/mysql-test/main/mysqlbinlog-master.opt
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result
index 668952d20d7..668952d20d7 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/main/mysqlbinlog.result
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/main/mysqlbinlog.test
index 6988b2a8e9b..6988b2a8e9b 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/main/mysqlbinlog.test
diff --git a/mysql-test/r/mysqlbinlog_raw_mode.result b/mysql-test/main/mysqlbinlog_raw_mode.result
index b64a2148a82..b64a2148a82 100644
--- a/mysql-test/r/mysqlbinlog_raw_mode.result
+++ b/mysql-test/main/mysqlbinlog_raw_mode.result
diff --git a/mysql-test/t/mysqlbinlog_raw_mode.test b/mysql-test/main/mysqlbinlog_raw_mode.test
index 26fb31516f6..26fb31516f6 100644
--- a/mysql-test/t/mysqlbinlog_raw_mode.test
+++ b/mysql-test/main/mysqlbinlog_raw_mode.test
diff --git a/mysql-test/r/mysqlbinlog_row_big.result b/mysql-test/main/mysqlbinlog_row_big.result
index a90ba9d79b6..a90ba9d79b6 100644
--- a/mysql-test/r/mysqlbinlog_row_big.result
+++ b/mysql-test/main/mysqlbinlog_row_big.result
diff --git a/mysql-test/t/mysqlbinlog_row_big.test b/mysql-test/main/mysqlbinlog_row_big.test
index 229cc8a31fc..229cc8a31fc 100644
--- a/mysql-test/t/mysqlbinlog_row_big.test
+++ b/mysql-test/main/mysqlbinlog_row_big.test
diff --git a/mysql-test/r/mysqlbinlog_row_compressed.result b/mysql-test/main/mysqlbinlog_row_compressed.result
index cbea1cf9def..cbea1cf9def 100644
--- a/mysql-test/r/mysqlbinlog_row_compressed.result
+++ b/mysql-test/main/mysqlbinlog_row_compressed.result
diff --git a/mysql-test/t/mysqlbinlog_row_compressed.test b/mysql-test/main/mysqlbinlog_row_compressed.test
index 1a7ce093986..1a7ce093986 100644
--- a/mysql-test/t/mysqlbinlog_row_compressed.test
+++ b/mysql-test/main/mysqlbinlog_row_compressed.test
diff --git a/mysql-test/t/mysqlbinlog_row_minimal.opt b/mysql-test/main/mysqlbinlog_row_minimal.opt
index 0e90a53dd3a..0e90a53dd3a 100644
--- a/mysql-test/t/mysqlbinlog_row_minimal.opt
+++ b/mysql-test/main/mysqlbinlog_row_minimal.opt
diff --git a/mysql-test/r/mysqlbinlog_row_minimal.result b/mysql-test/main/mysqlbinlog_row_minimal.result
index 6417a528638..6417a528638 100644
--- a/mysql-test/r/mysqlbinlog_row_minimal.result
+++ b/mysql-test/main/mysqlbinlog_row_minimal.result
diff --git a/mysql-test/t/mysqlbinlog_row_minimal.test b/mysql-test/main/mysqlbinlog_row_minimal.test
index 7909f75e9a1..7909f75e9a1 100644
--- a/mysql-test/t/mysqlbinlog_row_minimal.test
+++ b/mysql-test/main/mysqlbinlog_row_minimal.test
diff --git a/mysql-test/r/mysqlbinlog_stmt_compressed.result b/mysql-test/main/mysqlbinlog_stmt_compressed.result
index cd8e98c1ee3..cd8e98c1ee3 100644
--- a/mysql-test/r/mysqlbinlog_stmt_compressed.result
+++ b/mysql-test/main/mysqlbinlog_stmt_compressed.result
diff --git a/mysql-test/t/mysqlbinlog_stmt_compressed.test b/mysql-test/main/mysqlbinlog_stmt_compressed.test
index c4331ddf229..c4331ddf229 100644
--- a/mysql-test/t/mysqlbinlog_stmt_compressed.test
+++ b/mysql-test/main/mysqlbinlog_stmt_compressed.test
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/main/mysqlcheck.result
index 7259b68be50..7259b68be50 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/main/mysqlcheck.result
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/main/mysqlcheck.test
index 779ea8d13d4..779ea8d13d4 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/main/mysqlcheck.test
diff --git a/mysql-test/r/mysqld--defaults-file.result b/mysql-test/main/mysqld--defaults-file.result
index 5fd5ca8d95a..5fd5ca8d95a 100644
--- a/mysql-test/r/mysqld--defaults-file.result
+++ b/mysql-test/main/mysqld--defaults-file.result
diff --git a/mysql-test/t/mysqld--defaults-file.test b/mysql-test/main/mysqld--defaults-file.test
index 3bfe0aa891f..3bfe0aa891f 100644
--- a/mysql-test/t/mysqld--defaults-file.test
+++ b/mysql-test/main/mysqld--defaults-file.test
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/main/mysqld--help,win.rdiff
index 367744f6f5d..367744f6f5d 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/main/mysqld--help,win.rdiff
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/main/mysqld--help.result
index ef6a49df08b..ef6a49df08b 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/main/mysqld--help.test
index 27d3286685b..27d3286685b 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/main/mysqld--help.test
diff --git a/mysql-test/r/mysqld_help_crash-9183.result b/mysql-test/main/mysqld_help_crash-9183.result
index c0e5323d6d7..c0e5323d6d7 100644
--- a/mysql-test/r/mysqld_help_crash-9183.result
+++ b/mysql-test/main/mysqld_help_crash-9183.result
diff --git a/mysql-test/t/mysqld_help_crash-9183.test b/mysql-test/main/mysqld_help_crash-9183.test
index ff7df32e1d6..ff7df32e1d6 100644
--- a/mysql-test/t/mysqld_help_crash-9183.test
+++ b/mysql-test/main/mysqld_help_crash-9183.test
diff --git a/mysql-test/r/mysqld_option_err.result b/mysql-test/main/mysqld_option_err.result
index 4afcc5e0cb1..4afcc5e0cb1 100644
--- a/mysql-test/r/mysqld_option_err.result
+++ b/mysql-test/main/mysqld_option_err.result
diff --git a/mysql-test/t/mysqld_option_err.test b/mysql-test/main/mysqld_option_err.test
index 0c38eba7ca9..0c38eba7ca9 100644
--- a/mysql-test/t/mysqld_option_err.test
+++ b/mysql-test/main/mysqld_option_err.test
diff --git a/mysql-test/t/mysqldump-compat.opt b/mysql-test/main/mysqldump-compat.opt
index ac3d0509f2c..ac3d0509f2c 100644
--- a/mysql-test/t/mysqldump-compat.opt
+++ b/mysql-test/main/mysqldump-compat.opt
diff --git a/mysql-test/r/mysqldump-compat.result b/mysql-test/main/mysqldump-compat.result
index f15cc7a1d7a..f15cc7a1d7a 100644
--- a/mysql-test/r/mysqldump-compat.result
+++ b/mysql-test/main/mysqldump-compat.result
diff --git a/mysql-test/t/mysqldump-compat.test b/mysql-test/main/mysqldump-compat.test
index 9a830b16f26..9a830b16f26 100644
--- a/mysql-test/t/mysqldump-compat.test
+++ b/mysql-test/main/mysqldump-compat.test
diff --git a/mysql-test/t/mysqldump-max-master.opt b/mysql-test/main/mysqldump-max-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/mysqldump-max-master.opt
+++ b/mysql-test/main/mysqldump-max-master.opt
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/main/mysqldump-max.result
index b75eb969da6..b75eb969da6 100644
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/main/mysqldump-max.result
diff --git a/mysql-test/t/mysqldump-max.test b/mysql-test/main/mysqldump-max.test
index c0596f27e4f..c0596f27e4f 100644
--- a/mysql-test/t/mysqldump-max.test
+++ b/mysql-test/main/mysqldump-max.test
diff --git a/mysql-test/r/mysqldump-nl.result b/mysql-test/main/mysqldump-nl.result
index d2d0e09546b..d2d0e09546b 100644
--- a/mysql-test/r/mysqldump-nl.result
+++ b/mysql-test/main/mysqldump-nl.result
diff --git a/mysql-test/t/mysqldump-nl.test b/mysql-test/main/mysqldump-nl.test
index 4513fb2c637..4513fb2c637 100644
--- a/mysql-test/t/mysqldump-nl.test
+++ b/mysql-test/main/mysqldump-nl.test
diff --git a/mysql-test/t/mysqldump-no-binlog-master.opt b/mysql-test/main/mysqldump-no-binlog-master.opt
index 789275fa25e..789275fa25e 100644
--- a/mysql-test/t/mysqldump-no-binlog-master.opt
+++ b/mysql-test/main/mysqldump-no-binlog-master.opt
diff --git a/mysql-test/r/mysqldump-no-binlog.result b/mysql-test/main/mysqldump-no-binlog.result
index 78bc19b7cba..78bc19b7cba 100644
--- a/mysql-test/r/mysqldump-no-binlog.result
+++ b/mysql-test/main/mysqldump-no-binlog.result
diff --git a/mysql-test/t/mysqldump-no-binlog.test b/mysql-test/main/mysqldump-no-binlog.test
index 5f934bc440f..5f934bc440f 100644
--- a/mysql-test/t/mysqldump-no-binlog.test
+++ b/mysql-test/main/mysqldump-no-binlog.test
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/main/mysqldump.result
index a1e206dffd7..a1e206dffd7 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/main/mysqldump.test
index 6dde5aa7bc6..6dde5aa7bc6 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/main/mysqldump.test
diff --git a/mysql-test/r/mysqldump_restore.result b/mysql-test/main/mysqldump_restore.result
index 9eac8b253de..9eac8b253de 100644
--- a/mysql-test/r/mysqldump_restore.result
+++ b/mysql-test/main/mysqldump_restore.result
diff --git a/mysql-test/t/mysqldump_restore.test b/mysql-test/main/mysqldump_restore.test
index 835ee3ee9e9..835ee3ee9e9 100644
--- a/mysql-test/t/mysqldump_restore.test
+++ b/mysql-test/main/mysqldump_restore.test
diff --git a/mysql-test/r/mysqlhotcopy_myisam.result b/mysql-test/main/mysqlhotcopy_myisam.result
index 6080697a7a1..6080697a7a1 100644
--- a/mysql-test/r/mysqlhotcopy_myisam.result
+++ b/mysql-test/main/mysqlhotcopy_myisam.result
diff --git a/mysql-test/t/mysqlhotcopy_myisam.test b/mysql-test/main/mysqlhotcopy_myisam.test
index adf26e42245..adf26e42245 100644
--- a/mysql-test/t/mysqlhotcopy_myisam.test
+++ b/mysql-test/main/mysqlhotcopy_myisam.test
diff --git a/mysql-test/r/mysqlshow.result b/mysql-test/main/mysqlshow.result
index 609fb771bb8..609fb771bb8 100644
--- a/mysql-test/r/mysqlshow.result
+++ b/mysql-test/main/mysqlshow.result
diff --git a/mysql-test/t/mysqlshow.test b/mysql-test/main/mysqlshow.test
index 8c60b64a5f1..8c60b64a5f1 100644
--- a/mysql-test/t/mysqlshow.test
+++ b/mysql-test/main/mysqlshow.test
diff --git a/mysql-test/t/mysqlslap.opt b/mysql-test/main/mysqlslap.opt
index 632f5b4c069..632f5b4c069 100644
--- a/mysql-test/t/mysqlslap.opt
+++ b/mysql-test/main/mysqlslap.opt
diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/main/mysqlslap.result
index d3c5107dee3..d3c5107dee3 100644
--- a/mysql-test/r/mysqlslap.result
+++ b/mysql-test/main/mysqlslap.result
diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/main/mysqlslap.test
index c49c4ab3d7d..c49c4ab3d7d 100644
--- a/mysql-test/t/mysqlslap.test
+++ b/mysql-test/main/mysqlslap.test
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/main/mysqltest.result
index fe269152357..fe269152357 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/main/mysqltest.result
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/main/mysqltest.test
index d6c68ecf3c2..d6c68ecf3c2 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/main/mysqltest.test
diff --git a/mysql-test/r/mysqltest_256.result b/mysql-test/main/mysqltest_256.result
index 043c7208382..043c7208382 100644
--- a/mysql-test/r/mysqltest_256.result
+++ b/mysql-test/main/mysqltest_256.result
diff --git a/mysql-test/t/mysqltest_256.test b/mysql-test/main/mysqltest_256.test
index fd9447cd2d8..fd9447cd2d8 100644
--- a/mysql-test/t/mysqltest_256.test
+++ b/mysql-test/main/mysqltest_256.test
diff --git a/mysql-test/r/mysqltest_cont_on_error.result b/mysql-test/main/mysqltest_cont_on_error.result
index eaa17028f8d..eaa17028f8d 100644
--- a/mysql-test/r/mysqltest_cont_on_error.result
+++ b/mysql-test/main/mysqltest_cont_on_error.result
diff --git a/mysql-test/t/mysqltest_cont_on_error.test b/mysql-test/main/mysqltest_cont_on_error.test
index c6eeca9b5c3..c6eeca9b5c3 100644
--- a/mysql-test/t/mysqltest_cont_on_error.test
+++ b/mysql-test/main/mysqltest_cont_on_error.test
diff --git a/mysql-test/r/mysqltest_ps.result b/mysql-test/main/mysqltest_ps.result
index 153098ff088..153098ff088 100644
--- a/mysql-test/r/mysqltest_ps.result
+++ b/mysql-test/main/mysqltest_ps.result
diff --git a/mysql-test/t/mysqltest_ps.test b/mysql-test/main/mysqltest_ps.test
index c5a332f691f..c5a332f691f 100644
--- a/mysql-test/t/mysqltest_ps.test
+++ b/mysql-test/main/mysqltest_ps.test
diff --git a/mysql-test/t/named_pipe-master.opt b/mysql-test/main/named_pipe-master.opt
index e534ae1eae5..e534ae1eae5 100644
--- a/mysql-test/t/named_pipe-master.opt
+++ b/mysql-test/main/named_pipe-master.opt
diff --git a/mysql-test/r/named_pipe.result b/mysql-test/main/named_pipe.result
index 66da9a874b4..66da9a874b4 100644
--- a/mysql-test/r/named_pipe.result
+++ b/mysql-test/main/named_pipe.result
diff --git a/mysql-test/t/named_pipe.test b/mysql-test/main/named_pipe.test
index 8503907b808..8503907b808 100644
--- a/mysql-test/t/named_pipe.test
+++ b/mysql-test/main/named_pipe.test
diff --git a/mysql-test/r/negation_elimination.result b/mysql-test/main/negation_elimination.result
index 1b08baee60a..1b08baee60a 100644
--- a/mysql-test/r/negation_elimination.result
+++ b/mysql-test/main/negation_elimination.result
diff --git a/mysql-test/t/negation_elimination.test b/mysql-test/main/negation_elimination.test
index 312be8ccdb4..312be8ccdb4 100644
--- a/mysql-test/t/negation_elimination.test
+++ b/mysql-test/main/negation_elimination.test
diff --git a/mysql-test/t/no-threads-master.opt b/mysql-test/main/no-threads-master.opt
index 33e3e97bc0e..33e3e97bc0e 100644
--- a/mysql-test/t/no-threads-master.opt
+++ b/mysql-test/main/no-threads-master.opt
diff --git a/mysql-test/r/no-threads.result b/mysql-test/main/no-threads.result
index 9bc2dad6e2a..9bc2dad6e2a 100644
--- a/mysql-test/r/no-threads.result
+++ b/mysql-test/main/no-threads.result
diff --git a/mysql-test/t/no-threads.test b/mysql-test/main/no-threads.test
index a2936abf784..a2936abf784 100644
--- a/mysql-test/t/no-threads.test
+++ b/mysql-test/main/no-threads.test
diff --git a/mysql-test/r/no_binlog.result b/mysql-test/main/no_binlog.result
index 6ae267664fd..6ae267664fd 100644
--- a/mysql-test/r/no_binlog.result
+++ b/mysql-test/main/no_binlog.result
diff --git a/mysql-test/t/no_binlog.test b/mysql-test/main/no_binlog.test
index fa9c87079de..fa9c87079de 100644
--- a/mysql-test/t/no_binlog.test
+++ b/mysql-test/main/no_binlog.test
diff --git a/mysql-test/r/no_password_column-mdev-11170.result b/mysql-test/main/no_password_column-mdev-11170.result
index 6195100436d..6195100436d 100644
--- a/mysql-test/r/no_password_column-mdev-11170.result
+++ b/mysql-test/main/no_password_column-mdev-11170.result
diff --git a/mysql-test/t/no_password_column-mdev-11170.test b/mysql-test/main/no_password_column-mdev-11170.test
index 2cc4ba82ee8..2cc4ba82ee8 100644
--- a/mysql-test/t/no_password_column-mdev-11170.test
+++ b/mysql-test/main/no_password_column-mdev-11170.test
diff --git a/mysql-test/r/non_blocking_api.result b/mysql-test/main/non_blocking_api.result
index 4cb5c270f38..4cb5c270f38 100644
--- a/mysql-test/r/non_blocking_api.result
+++ b/mysql-test/main/non_blocking_api.result
diff --git a/mysql-test/t/non_blocking_api.test b/mysql-test/main/non_blocking_api.test
index b6b43427a76..b6b43427a76 100644
--- a/mysql-test/t/non_blocking_api.test
+++ b/mysql-test/main/non_blocking_api.test
diff --git a/mysql-test/r/not_embedded_server.result b/mysql-test/main/not_embedded_server.result
index ba68ca8619b..ba68ca8619b 100644
--- a/mysql-test/r/not_embedded_server.result
+++ b/mysql-test/main/not_embedded_server.result
diff --git a/mysql-test/t/not_embedded_server.test b/mysql-test/main/not_embedded_server.test
index b2cbdba6850..b2cbdba6850 100644
--- a/mysql-test/t/not_embedded_server.test
+++ b/mysql-test/main/not_embedded_server.test
diff --git a/mysql-test/r/not_partition.result b/mysql-test/main/not_partition.result
index 3d6f3fe39a3..3d6f3fe39a3 100644
--- a/mysql-test/r/not_partition.result
+++ b/mysql-test/main/not_partition.result
diff --git a/mysql-test/t/not_partition.test b/mysql-test/main/not_partition.test
index dd52e4b97e6..dd52e4b97e6 100644
--- a/mysql-test/t/not_partition.test
+++ b/mysql-test/main/not_partition.test
diff --git a/mysql-test/r/null.result b/mysql-test/main/null.result
index 2fa89a2d001..2fa89a2d001 100644
--- a/mysql-test/r/null.result
+++ b/mysql-test/main/null.result
diff --git a/mysql-test/t/null.test b/mysql-test/main/null.test
index 403790356ce..403790356ce 100644
--- a/mysql-test/t/null.test
+++ b/mysql-test/main/null.test
diff --git a/mysql-test/r/null_key.result b/mysql-test/main/null_key.result
index 4b4a4b80dee..4b4a4b80dee 100644
--- a/mysql-test/r/null_key.result
+++ b/mysql-test/main/null_key.result
diff --git a/mysql-test/t/null_key.test b/mysql-test/main/null_key.test
index c3ebc6f5b94..c3ebc6f5b94 100644
--- a/mysql-test/t/null_key.test
+++ b/mysql-test/main/null_key.test
diff --git a/mysql-test/r/odbc.result b/mysql-test/main/odbc.result
index 3dbac12ca7c..3dbac12ca7c 100644
--- a/mysql-test/r/odbc.result
+++ b/mysql-test/main/odbc.result
diff --git a/mysql-test/t/odbc.test b/mysql-test/main/odbc.test
index f1d60e15bc8..f1d60e15bc8 100644
--- a/mysql-test/t/odbc.test
+++ b/mysql-test/main/odbc.test
diff --git a/mysql-test/r/olap.result b/mysql-test/main/olap.result
index bcc96d4951d..bcc96d4951d 100644
--- a/mysql-test/r/olap.result
+++ b/mysql-test/main/olap.result
diff --git a/mysql-test/t/olap.test b/mysql-test/main/olap.test
index 3da08581a87..3da08581a87 100644
--- a/mysql-test/t/olap.test
+++ b/mysql-test/main/olap.test
diff --git a/mysql-test/t/old-mode-master.opt b/mysql-test/main/old-mode-master.opt
index 840ee0dedcf..840ee0dedcf 100644
--- a/mysql-test/t/old-mode-master.opt
+++ b/mysql-test/main/old-mode-master.opt
diff --git a/mysql-test/r/old-mode.result b/mysql-test/main/old-mode.result
index 73ad613048a..73ad613048a 100644
--- a/mysql-test/r/old-mode.result
+++ b/mysql-test/main/old-mode.result
diff --git a/mysql-test/t/old-mode.test b/mysql-test/main/old-mode.test
index d7e8ce8ee55..d7e8ce8ee55 100644
--- a/mysql-test/t/old-mode.test
+++ b/mysql-test/main/old-mode.test
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/main/openssl_1.result
index ca8d71895e2..ca8d71895e2 100644
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/main/openssl_1.result
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/main/openssl_1.test
index a3db700f787..a3db700f787 100644
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/main/openssl_1.test
diff --git a/mysql-test/r/openssl_6975,tlsv10.result b/mysql-test/main/openssl_6975,tlsv10.result
index b76a91bd134..b76a91bd134 100644
--- a/mysql-test/r/openssl_6975,tlsv10.result
+++ b/mysql-test/main/openssl_6975,tlsv10.result
diff --git a/mysql-test/r/openssl_6975,tlsv12.result b/mysql-test/main/openssl_6975,tlsv12.result
index c16e503c339..c16e503c339 100644
--- a/mysql-test/r/openssl_6975,tlsv12.result
+++ b/mysql-test/main/openssl_6975,tlsv12.result
diff --git a/mysql-test/t/openssl_6975.combinations b/mysql-test/main/openssl_6975.combinations
index 17517b7d552..17517b7d552 100644
--- a/mysql-test/t/openssl_6975.combinations
+++ b/mysql-test/main/openssl_6975.combinations
diff --git a/mysql-test/t/openssl_6975.test b/mysql-test/main/openssl_6975.test
index 6a82d013fb6..6a82d013fb6 100644
--- a/mysql-test/t/openssl_6975.test
+++ b/mysql-test/main/openssl_6975.test
diff --git a/mysql-test/r/opt_tvc.result b/mysql-test/main/opt_tvc.result
index 0ecae5bf157..0ecae5bf157 100644
--- a/mysql-test/r/opt_tvc.result
+++ b/mysql-test/main/opt_tvc.result
diff --git a/mysql-test/t/opt_tvc.test b/mysql-test/main/opt_tvc.test
index d5c9a5cbd3d..d5c9a5cbd3d 100644
--- a/mysql-test/t/opt_tvc.test
+++ b/mysql-test/main/opt_tvc.test
diff --git a/mysql-test/r/order_by-mdev-10122.result b/mysql-test/main/order_by-mdev-10122.result
index 57c0ecdd970..57c0ecdd970 100644
--- a/mysql-test/r/order_by-mdev-10122.result
+++ b/mysql-test/main/order_by-mdev-10122.result
diff --git a/mysql-test/t/order_by-mdev-10122.test b/mysql-test/main/order_by-mdev-10122.test
index 2520e6487ac..2520e6487ac 100644
--- a/mysql-test/t/order_by-mdev-10122.test
+++ b/mysql-test/main/order_by-mdev-10122.test
diff --git a/mysql-test/r/order_by.result b/mysql-test/main/order_by.result
index e2b05ccec9e..e2b05ccec9e 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/main/order_by.result
diff --git a/mysql-test/t/order_by.test b/mysql-test/main/order_by.test
index b047a31c863..b047a31c863 100644
--- a/mysql-test/t/order_by.test
+++ b/mysql-test/main/order_by.test
diff --git a/mysql-test/r/order_by_innodb.result b/mysql-test/main/order_by_innodb.result
index 3ff1f92e94a..3ff1f92e94a 100644
--- a/mysql-test/r/order_by_innodb.result
+++ b/mysql-test/main/order_by_innodb.result
diff --git a/mysql-test/t/order_by_innodb.test b/mysql-test/main/order_by_innodb.test
index 0debb777749..0debb777749 100644
--- a/mysql-test/t/order_by_innodb.test
+++ b/mysql-test/main/order_by_innodb.test
diff --git a/mysql-test/r/order_by_optimizer.result b/mysql-test/main/order_by_optimizer.result
index 8f128552a86..8f128552a86 100644
--- a/mysql-test/r/order_by_optimizer.result
+++ b/mysql-test/main/order_by_optimizer.result
diff --git a/mysql-test/t/order_by_optimizer.test b/mysql-test/main/order_by_optimizer.test
index a4c134afec9..a4c134afec9 100644
--- a/mysql-test/t/order_by_optimizer.test
+++ b/mysql-test/main/order_by_optimizer.test
diff --git a/mysql-test/r/order_by_optimizer_innodb.result b/mysql-test/main/order_by_optimizer_innodb.result
index 0b62ba997d8..0b62ba997d8 100644
--- a/mysql-test/r/order_by_optimizer_innodb.result
+++ b/mysql-test/main/order_by_optimizer_innodb.result
diff --git a/mysql-test/t/order_by_optimizer_innodb.test b/mysql-test/main/order_by_optimizer_innodb.test
index 90430d11549..90430d11549 100644
--- a/mysql-test/t/order_by_optimizer_innodb.test
+++ b/mysql-test/main/order_by_optimizer_innodb.test
diff --git a/mysql-test/r/order_by_sortkey.result b/mysql-test/main/order_by_sortkey.result
index c1d9609eb47..c1d9609eb47 100644
--- a/mysql-test/r/order_by_sortkey.result
+++ b/mysql-test/main/order_by_sortkey.result
diff --git a/mysql-test/t/order_by_sortkey.test b/mysql-test/main/order_by_sortkey.test
index 43de028496e..43de028496e 100644
--- a/mysql-test/t/order_by_sortkey.test
+++ b/mysql-test/main/order_by_sortkey.test
diff --git a/mysql-test/r/order_by_zerolength-4285.result b/mysql-test/main/order_by_zerolength-4285.result
index e6902105f20..e6902105f20 100644
--- a/mysql-test/r/order_by_zerolength-4285.result
+++ b/mysql-test/main/order_by_zerolength-4285.result
diff --git a/mysql-test/t/order_by_zerolength-4285.test b/mysql-test/main/order_by_zerolength-4285.test
index 079ce8da71e..079ce8da71e 100644
--- a/mysql-test/t/order_by_zerolength-4285.test
+++ b/mysql-test/main/order_by_zerolength-4285.test
diff --git a/mysql-test/r/order_fill_sortbuf.result b/mysql-test/main/order_fill_sortbuf.result
index 6a0bd9d966b..6a0bd9d966b 100644
--- a/mysql-test/r/order_fill_sortbuf.result
+++ b/mysql-test/main/order_fill_sortbuf.result
diff --git a/mysql-test/t/order_fill_sortbuf.test b/mysql-test/main/order_fill_sortbuf.test
index 33c09e34b91..33c09e34b91 100644
--- a/mysql-test/t/order_fill_sortbuf.test
+++ b/mysql-test/main/order_fill_sortbuf.test
diff --git a/mysql-test/r/outfile.result b/mysql-test/main/outfile.result
index 4c439c37e4d..4c439c37e4d 100644
--- a/mysql-test/r/outfile.result
+++ b/mysql-test/main/outfile.result
diff --git a/mysql-test/t/outfile.test b/mysql-test/main/outfile.test
index 9f2fc22da99..9f2fc22da99 100644
--- a/mysql-test/t/outfile.test
+++ b/mysql-test/main/outfile.test
diff --git a/mysql-test/r/outfile_loaddata.result b/mysql-test/main/outfile_loaddata.result
index ca3a42c087c..ca3a42c087c 100644
--- a/mysql-test/r/outfile_loaddata.result
+++ b/mysql-test/main/outfile_loaddata.result
diff --git a/mysql-test/t/outfile_loaddata.test b/mysql-test/main/outfile_loaddata.test
index 745c75cb4de..745c75cb4de 100644
--- a/mysql-test/t/outfile_loaddata.test
+++ b/mysql-test/main/outfile_loaddata.test
diff --git a/mysql-test/r/overflow.result b/mysql-test/main/overflow.result
index a3e93aa5cba..a3e93aa5cba 100644
--- a/mysql-test/r/overflow.result
+++ b/mysql-test/main/overflow.result
diff --git a/mysql-test/t/overflow.test b/mysql-test/main/overflow.test
index 774c43be658..774c43be658 100644
--- a/mysql-test/t/overflow.test
+++ b/mysql-test/main/overflow.test
diff --git a/mysql-test/r/packet.result b/mysql-test/main/packet.result
index 254ad93d78e..254ad93d78e 100644
--- a/mysql-test/r/packet.result
+++ b/mysql-test/main/packet.result
diff --git a/mysql-test/t/packet.test b/mysql-test/main/packet.test
index 7e08a0f6c3f..7e08a0f6c3f 100644
--- a/mysql-test/t/packet.test
+++ b/mysql-test/main/packet.test
diff --git a/mysql-test/r/parser.result b/mysql-test/main/parser.result
index a1c6e86a129..a1c6e86a129 100644
--- a/mysql-test/r/parser.result
+++ b/mysql-test/main/parser.result
diff --git a/mysql-test/t/parser.test b/mysql-test/main/parser.test
index 1f176c6afc5..1f176c6afc5 100644
--- a/mysql-test/t/parser.test
+++ b/mysql-test/main/parser.test
diff --git a/mysql-test/r/parser_bug21114_innodb.result b/mysql-test/main/parser_bug21114_innodb.result
index e39b63f571d..e39b63f571d 100644
--- a/mysql-test/r/parser_bug21114_innodb.result
+++ b/mysql-test/main/parser_bug21114_innodb.result
diff --git a/mysql-test/t/parser_bug21114_innodb.test b/mysql-test/main/parser_bug21114_innodb.test
index 969eea2da40..969eea2da40 100644
--- a/mysql-test/t/parser_bug21114_innodb.test
+++ b/mysql-test/main/parser_bug21114_innodb.test
diff --git a/mysql-test/r/parser_not_embedded.result b/mysql-test/main/parser_not_embedded.result
index 25349e51577..25349e51577 100644
--- a/mysql-test/r/parser_not_embedded.result
+++ b/mysql-test/main/parser_not_embedded.result
diff --git a/mysql-test/t/parser_not_embedded.test b/mysql-test/main/parser_not_embedded.test
index 3ebd23e888e..3ebd23e888e 100644
--- a/mysql-test/t/parser_not_embedded.test
+++ b/mysql-test/main/parser_not_embedded.test
diff --git a/mysql-test/r/parser_precedence.result b/mysql-test/main/parser_precedence.result
index 4330c8a2045..4330c8a2045 100644
--- a/mysql-test/r/parser_precedence.result
+++ b/mysql-test/main/parser_precedence.result
diff --git a/mysql-test/t/parser_precedence.test b/mysql-test/main/parser_precedence.test
index 7b69bc9c6da..7b69bc9c6da 100644
--- a/mysql-test/t/parser_precedence.test
+++ b/mysql-test/main/parser_precedence.test
diff --git a/mysql-test/r/parser_stack.result b/mysql-test/main/parser_stack.result
index a0040fc6ae6..a0040fc6ae6 100644
--- a/mysql-test/r/parser_stack.result
+++ b/mysql-test/main/parser_stack.result
diff --git a/mysql-test/t/parser_stack.test b/mysql-test/main/parser_stack.test
index 8bc316da18e..8bc316da18e 100644
--- a/mysql-test/t/parser_stack.test
+++ b/mysql-test/main/parser_stack.test
diff --git a/mysql-test/t/partition-master.opt b/mysql-test/main/partition-master.opt
index b1392bfd485..b1392bfd485 100644
--- a/mysql-test/t/partition-master.opt
+++ b/mysql-test/main/partition-master.opt
diff --git a/mysql-test/r/partition.result b/mysql-test/main/partition.result
index fd76da09d78..fd76da09d78 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/main/partition.result
diff --git a/mysql-test/t/partition.test b/mysql-test/main/partition.test
index 7b7d1457426..7b7d1457426 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/main/partition.test
diff --git a/mysql-test/r/partition_alter.result b/mysql-test/main/partition_alter.result
index e42604ba056..e42604ba056 100644
--- a/mysql-test/r/partition_alter.result
+++ b/mysql-test/main/partition_alter.result
diff --git a/mysql-test/t/partition_alter.test b/mysql-test/main/partition_alter.test
index 62a3e1c0777..62a3e1c0777 100644
--- a/mysql-test/t/partition_alter.test
+++ b/mysql-test/main/partition_alter.test
diff --git a/mysql-test/r/partition_binlog.result b/mysql-test/main/partition_binlog.result
index 21eca8f1c00..21eca8f1c00 100644
--- a/mysql-test/r/partition_binlog.result
+++ b/mysql-test/main/partition_binlog.result
diff --git a/mysql-test/t/partition_binlog.test b/mysql-test/main/partition_binlog.test
index d6986c86ebe..d6986c86ebe 100644
--- a/mysql-test/t/partition_binlog.test
+++ b/mysql-test/main/partition_binlog.test
diff --git a/mysql-test/r/partition_binlog_stmt.result b/mysql-test/main/partition_binlog_stmt.result
index 5b9df742f70..5b9df742f70 100644
--- a/mysql-test/r/partition_binlog_stmt.result
+++ b/mysql-test/main/partition_binlog_stmt.result
diff --git a/mysql-test/t/partition_binlog_stmt.test b/mysql-test/main/partition_binlog_stmt.test
index cc57222dc3c..cc57222dc3c 100644
--- a/mysql-test/t/partition_binlog_stmt.test
+++ b/mysql-test/main/partition_binlog_stmt.test
diff --git a/mysql-test/r/partition_blackhole.result b/mysql-test/main/partition_blackhole.result
index 225cc1886fd..225cc1886fd 100644
--- a/mysql-test/r/partition_blackhole.result
+++ b/mysql-test/main/partition_blackhole.result
diff --git a/mysql-test/t/partition_blackhole.test b/mysql-test/main/partition_blackhole.test
index 9344ecb3b62..9344ecb3b62 100644
--- a/mysql-test/t/partition_blackhole.test
+++ b/mysql-test/main/partition_blackhole.test
diff --git a/mysql-test/r/partition_bug18198.result b/mysql-test/main/partition_bug18198.result
index ee7bf514807..ee7bf514807 100644
--- a/mysql-test/r/partition_bug18198.result
+++ b/mysql-test/main/partition_bug18198.result
diff --git a/mysql-test/t/partition_bug18198.test b/mysql-test/main/partition_bug18198.test
index 720d483e8ed..720d483e8ed 100644
--- a/mysql-test/t/partition_bug18198.test
+++ b/mysql-test/main/partition_bug18198.test
diff --git a/mysql-test/r/partition_cache.result b/mysql-test/main/partition_cache.result
index 697ba1bcd15..697ba1bcd15 100644
--- a/mysql-test/r/partition_cache.result
+++ b/mysql-test/main/partition_cache.result
diff --git a/mysql-test/t/partition_cache.test b/mysql-test/main/partition_cache.test
index b5d19796b7c..b5d19796b7c 100644
--- a/mysql-test/t/partition_cache.test
+++ b/mysql-test/main/partition_cache.test
diff --git a/mysql-test/r/partition_cache_innodb.result b/mysql-test/main/partition_cache_innodb.result
index e6e69ee686e..e6e69ee686e 100644
--- a/mysql-test/r/partition_cache_innodb.result
+++ b/mysql-test/main/partition_cache_innodb.result
diff --git a/mysql-test/t/partition_cache_innodb.test b/mysql-test/main/partition_cache_innodb.test
index dbcfea3088c..dbcfea3088c 100644
--- a/mysql-test/t/partition_cache_innodb.test
+++ b/mysql-test/main/partition_cache_innodb.test
diff --git a/mysql-test/r/partition_cache_myisam.result b/mysql-test/main/partition_cache_myisam.result
index d8e4f837ff7..d8e4f837ff7 100644
--- a/mysql-test/r/partition_cache_myisam.result
+++ b/mysql-test/main/partition_cache_myisam.result
diff --git a/mysql-test/t/partition_cache_myisam.test b/mysql-test/main/partition_cache_myisam.test
index 5347225f6da..5347225f6da 100644
--- a/mysql-test/t/partition_cache_myisam.test
+++ b/mysql-test/main/partition_cache_myisam.test
diff --git a/mysql-test/r/partition_charset.result b/mysql-test/main/partition_charset.result
index f8f75e8bee7..f8f75e8bee7 100644
--- a/mysql-test/r/partition_charset.result
+++ b/mysql-test/main/partition_charset.result
diff --git a/mysql-test/t/partition_charset.test b/mysql-test/main/partition_charset.test
index 6842e5268fa..6842e5268fa 100644
--- a/mysql-test/t/partition_charset.test
+++ b/mysql-test/main/partition_charset.test
diff --git a/mysql-test/r/partition_column.result b/mysql-test/main/partition_column.result
index 041c485c1a8..041c485c1a8 100644
--- a/mysql-test/r/partition_column.result
+++ b/mysql-test/main/partition_column.result
diff --git a/mysql-test/t/partition_column.test b/mysql-test/main/partition_column.test
index be34e4eac63..be34e4eac63 100644
--- a/mysql-test/t/partition_column.test
+++ b/mysql-test/main/partition_column.test
diff --git a/mysql-test/r/partition_column_prune.result b/mysql-test/main/partition_column_prune.result
index 95b45f4dea5..95b45f4dea5 100644
--- a/mysql-test/r/partition_column_prune.result
+++ b/mysql-test/main/partition_column_prune.result
diff --git a/mysql-test/t/partition_column_prune.test b/mysql-test/main/partition_column_prune.test
index 848825ba71b..848825ba71b 100644
--- a/mysql-test/t/partition_column_prune.test
+++ b/mysql-test/main/partition_column_prune.test
diff --git a/mysql-test/r/partition_csv.result b/mysql-test/main/partition_csv.result
index 836c49682b2..836c49682b2 100644
--- a/mysql-test/r/partition_csv.result
+++ b/mysql-test/main/partition_csv.result
diff --git a/mysql-test/t/partition_csv.test b/mysql-test/main/partition_csv.test
index 44013dd4b0a..44013dd4b0a 100644
--- a/mysql-test/t/partition_csv.test
+++ b/mysql-test/main/partition_csv.test
diff --git a/mysql-test/r/partition_datatype.result b/mysql-test/main/partition_datatype.result
index 2e518c194f0..2e518c194f0 100644
--- a/mysql-test/r/partition_datatype.result
+++ b/mysql-test/main/partition_datatype.result
diff --git a/mysql-test/t/partition_datatype.test b/mysql-test/main/partition_datatype.test
index 9ab3bd4d5fa..9ab3bd4d5fa 100644
--- a/mysql-test/t/partition_datatype.test
+++ b/mysql-test/main/partition_datatype.test
diff --git a/mysql-test/r/partition_debug_sync.result b/mysql-test/main/partition_debug_sync.result
index b79385686b7..b79385686b7 100644
--- a/mysql-test/r/partition_debug_sync.result
+++ b/mysql-test/main/partition_debug_sync.result
diff --git a/mysql-test/t/partition_debug_sync.test b/mysql-test/main/partition_debug_sync.test
index f085ea3fb83..f085ea3fb83 100644
--- a/mysql-test/t/partition_debug_sync.test
+++ b/mysql-test/main/partition_debug_sync.test
diff --git a/mysql-test/r/partition_default.result b/mysql-test/main/partition_default.result
index db3b714bbcc..db3b714bbcc 100644
--- a/mysql-test/r/partition_default.result
+++ b/mysql-test/main/partition_default.result
diff --git a/mysql-test/t/partition_default.test b/mysql-test/main/partition_default.test
index b0424f567e4..b0424f567e4 100644
--- a/mysql-test/t/partition_default.test
+++ b/mysql-test/main/partition_default.test
diff --git a/mysql-test/t/partition_disabled-master.opt b/mysql-test/main/partition_disabled-master.opt
index 2703cb02f07..2703cb02f07 100644
--- a/mysql-test/t/partition_disabled-master.opt
+++ b/mysql-test/main/partition_disabled-master.opt
diff --git a/mysql-test/r/partition_disabled.result b/mysql-test/main/partition_disabled.result
index c78552beb9d..c78552beb9d 100644
--- a/mysql-test/r/partition_disabled.result
+++ b/mysql-test/main/partition_disabled.result
diff --git a/mysql-test/t/partition_disabled.test b/mysql-test/main/partition_disabled.test
index 940aea105ce..940aea105ce 100644
--- a/mysql-test/t/partition_disabled.test
+++ b/mysql-test/main/partition_disabled.test
diff --git a/mysql-test/r/partition_error.result b/mysql-test/main/partition_error.result
index 349e9771367..349e9771367 100644
--- a/mysql-test/r/partition_error.result
+++ b/mysql-test/main/partition_error.result
diff --git a/mysql-test/t/partition_error.test b/mysql-test/main/partition_error.test
index 3ee54605c36..3ee54605c36 100644
--- a/mysql-test/t/partition_error.test
+++ b/mysql-test/main/partition_error.test
diff --git a/mysql-test/r/partition_example.result b/mysql-test/main/partition_example.result
index 3aa1ed639ca..3aa1ed639ca 100644
--- a/mysql-test/r/partition_example.result
+++ b/mysql-test/main/partition_example.result
diff --git a/mysql-test/t/partition_example.test b/mysql-test/main/partition_example.test
index 8c1b92b2e33..8c1b92b2e33 100644
--- a/mysql-test/t/partition_example.test
+++ b/mysql-test/main/partition_example.test
diff --git a/mysql-test/t/partition_exchange-master.opt b/mysql-test/main/partition_exchange-master.opt
index 5a0380b7a1d..5a0380b7a1d 100644
--- a/mysql-test/t/partition_exchange-master.opt
+++ b/mysql-test/main/partition_exchange-master.opt
diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/main/partition_exchange.result
index 3bce5aec8e2..3bce5aec8e2 100644
--- a/mysql-test/r/partition_exchange.result
+++ b/mysql-test/main/partition_exchange.result
diff --git a/mysql-test/t/partition_exchange.test b/mysql-test/main/partition_exchange.test
index 8dc40da0caa..8dc40da0caa 100644
--- a/mysql-test/t/partition_exchange.test
+++ b/mysql-test/main/partition_exchange.test
diff --git a/mysql-test/r/partition_explicit_prune.result b/mysql-test/main/partition_explicit_prune.result
index bfcfe7deef6..bfcfe7deef6 100644
--- a/mysql-test/r/partition_explicit_prune.result
+++ b/mysql-test/main/partition_explicit_prune.result
diff --git a/mysql-test/t/partition_explicit_prune.test b/mysql-test/main/partition_explicit_prune.test
index 68b829fbcc3..68b829fbcc3 100644
--- a/mysql-test/t/partition_explicit_prune.test
+++ b/mysql-test/main/partition_explicit_prune.test
diff --git a/mysql-test/r/partition_grant.result b/mysql-test/main/partition_grant.result
index cd8f8a970d0..cd8f8a970d0 100644
--- a/mysql-test/r/partition_grant.result
+++ b/mysql-test/main/partition_grant.result
diff --git a/mysql-test/t/partition_grant.test b/mysql-test/main/partition_grant.test
index a5df218bb10..a5df218bb10 100644
--- a/mysql-test/t/partition_grant.test
+++ b/mysql-test/main/partition_grant.test
diff --git a/mysql-test/r/partition_hash.result b/mysql-test/main/partition_hash.result
index 9a63db3f974..9a63db3f974 100644
--- a/mysql-test/r/partition_hash.result
+++ b/mysql-test/main/partition_hash.result
diff --git a/mysql-test/t/partition_hash.test b/mysql-test/main/partition_hash.test
index c8f473a0477..c8f473a0477 100644
--- a/mysql-test/t/partition_hash.test
+++ b/mysql-test/main/partition_hash.test
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/main/partition_innodb.result
index d27abc07984..d27abc07984 100644
--- a/mysql-test/r/partition_innodb.result
+++ b/mysql-test/main/partition_innodb.result
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/main/partition_innodb.test
index 7b5a69fe622..7b5a69fe622 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/main/partition_innodb.test
diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/main/partition_innodb_plugin.result
index 6842ff04caa..6842ff04caa 100644
--- a/mysql-test/r/partition_innodb_plugin.result
+++ b/mysql-test/main/partition_innodb_plugin.result
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/main/partition_innodb_plugin.test
index 74e1747746b..74e1747746b 100644
--- a/mysql-test/t/partition_innodb_plugin.test
+++ b/mysql-test/main/partition_innodb_plugin.test
diff --git a/mysql-test/t/partition_innodb_semi_consistent-master.opt b/mysql-test/main/partition_innodb_semi_consistent-master.opt
index a177f285d66..a177f285d66 100644
--- a/mysql-test/t/partition_innodb_semi_consistent-master.opt
+++ b/mysql-test/main/partition_innodb_semi_consistent-master.opt
diff --git a/mysql-test/r/partition_innodb_semi_consistent.result b/mysql-test/main/partition_innodb_semi_consistent.result
index 208bd0214f7..208bd0214f7 100644
--- a/mysql-test/r/partition_innodb_semi_consistent.result
+++ b/mysql-test/main/partition_innodb_semi_consistent.result
diff --git a/mysql-test/t/partition_innodb_semi_consistent.test b/mysql-test/main/partition_innodb_semi_consistent.test
index 7a1dfc36173..7a1dfc36173 100644
--- a/mysql-test/t/partition_innodb_semi_consistent.test
+++ b/mysql-test/main/partition_innodb_semi_consistent.test
diff --git a/mysql-test/r/partition_innodb_stmt.result b/mysql-test/main/partition_innodb_stmt.result
index 543d4734216..543d4734216 100644
--- a/mysql-test/r/partition_innodb_stmt.result
+++ b/mysql-test/main/partition_innodb_stmt.result
diff --git a/mysql-test/t/partition_innodb_stmt.test b/mysql-test/main/partition_innodb_stmt.test
index 96a59cb9311..96a59cb9311 100644
--- a/mysql-test/t/partition_innodb_stmt.test
+++ b/mysql-test/main/partition_innodb_stmt.test
diff --git a/mysql-test/r/partition_key_cache.result b/mysql-test/main/partition_key_cache.result
index f1b174ca249..f1b174ca249 100644
--- a/mysql-test/r/partition_key_cache.result
+++ b/mysql-test/main/partition_key_cache.result
diff --git a/mysql-test/t/partition_key_cache.test b/mysql-test/main/partition_key_cache.test
index 067eb7fae59..067eb7fae59 100644
--- a/mysql-test/t/partition_key_cache.test
+++ b/mysql-test/main/partition_key_cache.test
diff --git a/mysql-test/r/partition_list.result b/mysql-test/main/partition_list.result
index 91c1c106cea..91c1c106cea 100644
--- a/mysql-test/r/partition_list.result
+++ b/mysql-test/main/partition_list.result
diff --git a/mysql-test/t/partition_list.test b/mysql-test/main/partition_list.test
index e2b6aff300f..e2b6aff300f 100644
--- a/mysql-test/t/partition_list.test
+++ b/mysql-test/main/partition_list.test
diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/main/partition_mgm.result
index 37733a4e764..37733a4e764 100644
--- a/mysql-test/r/partition_mgm.result
+++ b/mysql-test/main/partition_mgm.result
diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/main/partition_mgm.test
index bf9b5ed174e..bf9b5ed174e 100644
--- a/mysql-test/t/partition_mgm.test
+++ b/mysql-test/main/partition_mgm.test
diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/main/partition_mgm_err.result
index e3c4bbf2af7..e3c4bbf2af7 100644
--- a/mysql-test/r/partition_mgm_err.result
+++ b/mysql-test/main/partition_mgm_err.result
diff --git a/mysql-test/t/partition_mgm_err.test b/mysql-test/main/partition_mgm_err.test
index 0987c427fc7..0987c427fc7 100644
--- a/mysql-test/t/partition_mgm_err.test
+++ b/mysql-test/main/partition_mgm_err.test
diff --git a/mysql-test/r/partition_mgm_err2.result b/mysql-test/main/partition_mgm_err2.result
index 7e5763b8f1b..7e5763b8f1b 100644
--- a/mysql-test/r/partition_mgm_err2.result
+++ b/mysql-test/main/partition_mgm_err2.result
diff --git a/mysql-test/t/partition_mgm_err2.test b/mysql-test/main/partition_mgm_err2.test
index f683ec6277e..f683ec6277e 100644
--- a/mysql-test/t/partition_mgm_err2.test
+++ b/mysql-test/main/partition_mgm_err2.test
diff --git a/mysql-test/r/partition_myisam.result b/mysql-test/main/partition_myisam.result
index 8f35075261a..8f35075261a 100644
--- a/mysql-test/r/partition_myisam.result
+++ b/mysql-test/main/partition_myisam.result
diff --git a/mysql-test/t/partition_myisam.test b/mysql-test/main/partition_myisam.test
index 4d083c37b68..4d083c37b68 100644
--- a/mysql-test/t/partition_myisam.test
+++ b/mysql-test/main/partition_myisam.test
diff --git a/mysql-test/t/partition_not_blackhole-master.opt b/mysql-test/main/partition_not_blackhole-master.opt
index 1e47be930bc..1e47be930bc 100644
--- a/mysql-test/t/partition_not_blackhole-master.opt
+++ b/mysql-test/main/partition_not_blackhole-master.opt
diff --git a/mysql-test/r/partition_not_blackhole.result b/mysql-test/main/partition_not_blackhole.result
index ff1e51df892..ff1e51df892 100644
--- a/mysql-test/r/partition_not_blackhole.result
+++ b/mysql-test/main/partition_not_blackhole.result
diff --git a/mysql-test/t/partition_not_blackhole.test b/mysql-test/main/partition_not_blackhole.test
index d9e653b5252..d9e653b5252 100644
--- a/mysql-test/t/partition_not_blackhole.test
+++ b/mysql-test/main/partition_not_blackhole.test
diff --git a/mysql-test/t/partition_not_windows-master.opt b/mysql-test/main/partition_not_windows-master.opt
index b1392bfd485..b1392bfd485 100644
--- a/mysql-test/t/partition_not_windows-master.opt
+++ b/mysql-test/main/partition_not_windows-master.opt
diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/main/partition_not_windows.result
index 03282ac134a..03282ac134a 100644
--- a/mysql-test/r/partition_not_windows.result
+++ b/mysql-test/main/partition_not_windows.result
diff --git a/mysql-test/t/partition_not_windows.test b/mysql-test/main/partition_not_windows.test
index 429329c79bb..429329c79bb 100644
--- a/mysql-test/t/partition_not_windows.test
+++ b/mysql-test/main/partition_not_windows.test
diff --git a/mysql-test/t/partition_open_files_limit-master.opt b/mysql-test/main/partition_open_files_limit-master.opt
index 4c1ed0c3da3..4c1ed0c3da3 100644
--- a/mysql-test/t/partition_open_files_limit-master.opt
+++ b/mysql-test/main/partition_open_files_limit-master.opt
diff --git a/mysql-test/r/partition_open_files_limit.result b/mysql-test/main/partition_open_files_limit.result
index fed32a69c44..fed32a69c44 100644
--- a/mysql-test/r/partition_open_files_limit.result
+++ b/mysql-test/main/partition_open_files_limit.result
diff --git a/mysql-test/t/partition_open_files_limit.test b/mysql-test/main/partition_open_files_limit.test
index e62ebd0ade7..e62ebd0ade7 100644
--- a/mysql-test/t/partition_open_files_limit.test
+++ b/mysql-test/main/partition_open_files_limit.test
diff --git a/mysql-test/r/partition_order.result b/mysql-test/main/partition_order.result
index cecfc90eefb..cecfc90eefb 100644
--- a/mysql-test/r/partition_order.result
+++ b/mysql-test/main/partition_order.result
diff --git a/mysql-test/t/partition_order.test b/mysql-test/main/partition_order.test
index ad956361d00..ad956361d00 100644
--- a/mysql-test/t/partition_order.test
+++ b/mysql-test/main/partition_order.test
diff --git a/mysql-test/r/partition_pruning.result b/mysql-test/main/partition_pruning.result
index 422132dd1c3..422132dd1c3 100644
--- a/mysql-test/r/partition_pruning.result
+++ b/mysql-test/main/partition_pruning.result
diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/main/partition_pruning.test
index 9d72e9c0d01..9d72e9c0d01 100644
--- a/mysql-test/t/partition_pruning.test
+++ b/mysql-test/main/partition_pruning.test
diff --git a/mysql-test/r/partition_range.result b/mysql-test/main/partition_range.result
index 7ae029d488c..7ae029d488c 100644
--- a/mysql-test/r/partition_range.result
+++ b/mysql-test/main/partition_range.result
diff --git a/mysql-test/t/partition_range.test b/mysql-test/main/partition_range.test
index 3ff03248d88..3ff03248d88 100644
--- a/mysql-test/t/partition_range.test
+++ b/mysql-test/main/partition_range.test
diff --git a/mysql-test/r/partition_rename_longfilename.result b/mysql-test/main/partition_rename_longfilename.result
index e6bea554481..e6bea554481 100644
--- a/mysql-test/r/partition_rename_longfilename.result
+++ b/mysql-test/main/partition_rename_longfilename.result
diff --git a/mysql-test/t/partition_rename_longfilename.test b/mysql-test/main/partition_rename_longfilename.test
index 51d9c583f56..51d9c583f56 100644
--- a/mysql-test/t/partition_rename_longfilename.test
+++ b/mysql-test/main/partition_rename_longfilename.test
diff --git a/mysql-test/r/partition_symlink.result b/mysql-test/main/partition_symlink.result
index 90048eb3438..90048eb3438 100644
--- a/mysql-test/r/partition_symlink.result
+++ b/mysql-test/main/partition_symlink.result
diff --git a/mysql-test/t/partition_symlink.test b/mysql-test/main/partition_symlink.test
index 8f6e837299a..8f6e837299a 100644
--- a/mysql-test/t/partition_symlink.test
+++ b/mysql-test/main/partition_symlink.test
diff --git a/mysql-test/r/partition_sync.result b/mysql-test/main/partition_sync.result
index 18cc506e849..18cc506e849 100644
--- a/mysql-test/r/partition_sync.result
+++ b/mysql-test/main/partition_sync.result
diff --git a/mysql-test/t/partition_sync.test b/mysql-test/main/partition_sync.test
index fd704f35534..fd704f35534 100644
--- a/mysql-test/t/partition_sync.test
+++ b/mysql-test/main/partition_sync.test
diff --git a/mysql-test/r/partition_truncate.result b/mysql-test/main/partition_truncate.result
index 7a82e47d818..7a82e47d818 100644
--- a/mysql-test/r/partition_truncate.result
+++ b/mysql-test/main/partition_truncate.result
diff --git a/mysql-test/t/partition_truncate.test b/mysql-test/main/partition_truncate.test
index 62ed548808f..62ed548808f 100644
--- a/mysql-test/t/partition_truncate.test
+++ b/mysql-test/main/partition_truncate.test
diff --git a/mysql-test/r/partition_utf8.result b/mysql-test/main/partition_utf8.result
index 7718e651423..7718e651423 100644
--- a/mysql-test/r/partition_utf8.result
+++ b/mysql-test/main/partition_utf8.result
diff --git a/mysql-test/t/partition_utf8.test b/mysql-test/main/partition_utf8.test
index d3ad7ba671e..d3ad7ba671e 100644
--- a/mysql-test/t/partition_utf8.test
+++ b/mysql-test/main/partition_utf8.test
diff --git a/mysql-test/r/partition_windows.result b/mysql-test/main/partition_windows.result
index 756690925f8..756690925f8 100644
--- a/mysql-test/r/partition_windows.result
+++ b/mysql-test/main/partition_windows.result
diff --git a/mysql-test/t/partition_windows.test b/mysql-test/main/partition_windows.test
index d42a7383c99..d42a7383c99 100644
--- a/mysql-test/t/partition_windows.test
+++ b/mysql-test/main/partition_windows.test
diff --git a/mysql-test/r/perror-win.result b/mysql-test/main/perror-win.result
index 139b566757f..139b566757f 100644
--- a/mysql-test/r/perror-win.result
+++ b/mysql-test/main/perror-win.result
diff --git a/mysql-test/t/perror-win.test b/mysql-test/main/perror-win.test
index cc09b8527be..f6fdd2a42f2 100644
--- a/mysql-test/t/perror-win.test
+++ b/mysql-test/main/perror-win.test
@@ -1,6 +1,6 @@
 # Windows-specific tests
 --source include/windows.inc
---require r/have_perror.require
+--require include/have_perror.require
 disable_query_log;
 eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
 enable_query_log;
diff --git a/mysql-test/r/perror.result b/mysql-test/main/perror.result
index 432a4fd4c04..432a4fd4c04 100644
--- a/mysql-test/r/perror.result
+++ b/mysql-test/main/perror.result
diff --git a/mysql-test/t/perror.test b/mysql-test/main/perror.test
index 69f1cb3257e..f1c8926ad25 100644
--- a/mysql-test/t/perror.test
+++ b/mysql-test/main/perror.test
@@ -2,7 +2,7 @@
 #
 # Check if the variable MY_PERROR is set
 #
---require r/have_perror.require
+--require include/have_perror.require
 disable_query_log;
 eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
 enable_query_log;
diff --git a/mysql-test/r/plugin.result b/mysql-test/main/plugin.result
index 3a141a25b5c..3a141a25b5c 100644
--- a/mysql-test/r/plugin.result
+++ b/mysql-test/main/plugin.result
diff --git a/mysql-test/t/plugin.test b/mysql-test/main/plugin.test
index 68c4d5afd64..68c4d5afd64 100644
--- a/mysql-test/t/plugin.test
+++ b/mysql-test/main/plugin.test
diff --git a/mysql-test/r/plugin_auth.result b/mysql-test/main/plugin_auth.result
index e470cc010c0..e470cc010c0 100644
--- a/mysql-test/r/plugin_auth.result
+++ b/mysql-test/main/plugin_auth.result
diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/main/plugin_auth.test
index c3c18b7e427..c3c18b7e427 100644
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/main/plugin_auth.test
diff --git a/mysql-test/r/plugin_auth_qa.result b/mysql-test/main/plugin_auth_qa.result
index 4f274c45971..4f274c45971 100644
--- a/mysql-test/r/plugin_auth_qa.result
+++ b/mysql-test/main/plugin_auth_qa.result
diff --git a/mysql-test/t/plugin_auth_qa.test b/mysql-test/main/plugin_auth_qa.test
index fce72a66702..fce72a66702 100644
--- a/mysql-test/t/plugin_auth_qa.test
+++ b/mysql-test/main/plugin_auth_qa.test
diff --git a/mysql-test/r/plugin_auth_qa_1.result b/mysql-test/main/plugin_auth_qa_1.result
index 42a7b1491c0..42a7b1491c0 100644
--- a/mysql-test/r/plugin_auth_qa_1.result
+++ b/mysql-test/main/plugin_auth_qa_1.result
diff --git a/mysql-test/t/plugin_auth_qa_1.test b/mysql-test/main/plugin_auth_qa_1.test
index b0b8ffb3544..b0b8ffb3544 100644
--- a/mysql-test/t/plugin_auth_qa_1.test
+++ b/mysql-test/main/plugin_auth_qa_1.test
diff --git a/mysql-test/t/plugin_auth_qa_2-master.opt b/mysql-test/main/plugin_auth_qa_2-master.opt
index 6429a4458aa..6429a4458aa 100644
--- a/mysql-test/t/plugin_auth_qa_2-master.opt
+++ b/mysql-test/main/plugin_auth_qa_2-master.opt
diff --git a/mysql-test/r/plugin_auth_qa_2.result b/mysql-test/main/plugin_auth_qa_2.result
index fa88530be6a..fa88530be6a 100644
--- a/mysql-test/r/plugin_auth_qa_2.result
+++ b/mysql-test/main/plugin_auth_qa_2.result
diff --git a/mysql-test/t/plugin_auth_qa_2.test b/mysql-test/main/plugin_auth_qa_2.test
index db92f6ee453..db92f6ee453 100644
--- a/mysql-test/t/plugin_auth_qa_2.test
+++ b/mysql-test/main/plugin_auth_qa_2.test
diff --git a/mysql-test/t/plugin_auth_qa_3-master.opt b/mysql-test/main/plugin_auth_qa_3-master.opt
index db4629aa09d..db4629aa09d 100644
--- a/mysql-test/t/plugin_auth_qa_3-master.opt
+++ b/mysql-test/main/plugin_auth_qa_3-master.opt
diff --git a/mysql-test/r/plugin_auth_qa_3.result b/mysql-test/main/plugin_auth_qa_3.result
index 62a37a21478..62a37a21478 100644
--- a/mysql-test/r/plugin_auth_qa_3.result
+++ b/mysql-test/main/plugin_auth_qa_3.result
diff --git a/mysql-test/t/plugin_auth_qa_3.test b/mysql-test/main/plugin_auth_qa_3.test
index 349d574227a..349d574227a 100644
--- a/mysql-test/t/plugin_auth_qa_3.test
+++ b/mysql-test/main/plugin_auth_qa_3.test
diff --git a/mysql-test/r/plugin_innodb.result b/mysql-test/main/plugin_innodb.result
index 48510ad8745..48510ad8745 100644
--- a/mysql-test/r/plugin_innodb.result
+++ b/mysql-test/main/plugin_innodb.result
diff --git a/mysql-test/t/plugin_innodb.test b/mysql-test/main/plugin_innodb.test
index fb5dd84b997..fb5dd84b997 100644
--- a/mysql-test/t/plugin_innodb.test
+++ b/mysql-test/main/plugin_innodb.test
diff --git a/mysql-test/t/plugin_load.opt b/mysql-test/main/plugin_load.opt
index aeeb2e4eb7d..aeeb2e4eb7d 100644
--- a/mysql-test/t/plugin_load.opt
+++ b/mysql-test/main/plugin_load.opt
diff --git a/mysql-test/r/plugin_load.result b/mysql-test/main/plugin_load.result
index 35bacf670a5..35bacf670a5 100644
--- a/mysql-test/r/plugin_load.result
+++ b/mysql-test/main/plugin_load.result
diff --git a/mysql-test/t/plugin_load.test b/mysql-test/main/plugin_load.test
index fdae622645a..fdae622645a 100644
--- a/mysql-test/t/plugin_load.test
+++ b/mysql-test/main/plugin_load.test
diff --git a/mysql-test/t/plugin_load_option.opt b/mysql-test/main/plugin_load_option.opt
index be9bc9d5487..be9bc9d5487 100644
--- a/mysql-test/t/plugin_load_option.opt
+++ b/mysql-test/main/plugin_load_option.opt
diff --git a/mysql-test/r/plugin_load_option.result b/mysql-test/main/plugin_load_option.result
index fec41bac8e6..fec41bac8e6 100644
--- a/mysql-test/r/plugin_load_option.result
+++ b/mysql-test/main/plugin_load_option.result
diff --git a/mysql-test/t/plugin_load_option.test b/mysql-test/main/plugin_load_option.test
index e49b693b5be..e49b693b5be 100644
--- a/mysql-test/t/plugin_load_option.test
+++ b/mysql-test/main/plugin_load_option.test
diff --git a/mysql-test/t/plugin_loaderr.opt b/mysql-test/main/plugin_loaderr.opt
index 38cb906723d..38cb906723d 100644
--- a/mysql-test/t/plugin_loaderr.opt
+++ b/mysql-test/main/plugin_loaderr.opt
diff --git a/mysql-test/r/plugin_loaderr.result b/mysql-test/main/plugin_loaderr.result
index fbb144a7b90..fbb144a7b90 100644
--- a/mysql-test/r/plugin_loaderr.result
+++ b/mysql-test/main/plugin_loaderr.result
diff --git a/mysql-test/t/plugin_loaderr.test b/mysql-test/main/plugin_loaderr.test
index 85621ad047d..85621ad047d 100644
--- a/mysql-test/t/plugin_loaderr.test
+++ b/mysql-test/main/plugin_loaderr.test
diff --git a/mysql-test/t/plugin_maturity-master.opt b/mysql-test/main/plugin_maturity-master.opt
index 70ba6280117..70ba6280117 100644
--- a/mysql-test/t/plugin_maturity-master.opt
+++ b/mysql-test/main/plugin_maturity-master.opt
diff --git a/mysql-test/r/plugin_maturity.result b/mysql-test/main/plugin_maturity.result
index cd47830cbd3..cd47830cbd3 100644
--- a/mysql-test/r/plugin_maturity.result
+++ b/mysql-test/main/plugin_maturity.result
diff --git a/mysql-test/t/plugin_maturity.test b/mysql-test/main/plugin_maturity.test
index e1e4941492e..e1e4941492e 100644
--- a/mysql-test/t/plugin_maturity.test
+++ b/mysql-test/main/plugin_maturity.test
diff --git a/mysql-test/r/plugin_not_embedded.result b/mysql-test/main/plugin_not_embedded.result
index 2edf6c496d3..2edf6c496d3 100644
--- a/mysql-test/r/plugin_not_embedded.result
+++ b/mysql-test/main/plugin_not_embedded.result
diff --git a/mysql-test/t/plugin_not_embedded.test b/mysql-test/main/plugin_not_embedded.test
index 3b4129b6b6b..3b4129b6b6b 100644
--- a/mysql-test/t/plugin_not_embedded.test
+++ b/mysql-test/main/plugin_not_embedded.test
diff --git a/mysql-test/r/plugin_vars.result b/mysql-test/main/plugin_vars.result
index 0e382427b1d..0e382427b1d 100644
--- a/mysql-test/r/plugin_vars.result
+++ b/mysql-test/main/plugin_vars.result
diff --git a/mysql-test/t/plugin_vars.test b/mysql-test/main/plugin_vars.test
index 8ba8fe2ec0e..8ba8fe2ec0e 100644
--- a/mysql-test/t/plugin_vars.test
+++ b/mysql-test/main/plugin_vars.test
diff --git a/mysql-test/t/pool_of_threads.cnf b/mysql-test/main/pool_of_threads.cnf
index f6651c878de..f6651c878de 100644
--- a/mysql-test/t/pool_of_threads.cnf
+++ b/mysql-test/main/pool_of_threads.cnf
diff --git a/mysql-test/r/pool_of_threads.result b/mysql-test/main/pool_of_threads.result
index b25d8d1e50e..b25d8d1e50e 100644
--- a/mysql-test/r/pool_of_threads.result
+++ b/mysql-test/main/pool_of_threads.result
diff --git a/mysql-test/t/pool_of_threads.test b/mysql-test/main/pool_of_threads.test
index f13a096985c..f13a096985c 100644
--- a/mysql-test/t/pool_of_threads.test
+++ b/mysql-test/main/pool_of_threads.test
diff --git a/mysql-test/r/preload.result b/mysql-test/main/preload.result
index 7ed0c62f33a..7ed0c62f33a 100644
--- a/mysql-test/r/preload.result
+++ b/mysql-test/main/preload.result
diff --git a/mysql-test/t/preload.test b/mysql-test/main/preload.test
index 69949fccedc..69949fccedc 100644
--- a/mysql-test/t/preload.test
+++ b/mysql-test/main/preload.test
diff --git a/mysql-test/r/processlist.result b/mysql-test/main/processlist.result
index b8e2271530d..b8e2271530d 100644
--- a/mysql-test/r/processlist.result
+++ b/mysql-test/main/processlist.result
diff --git a/mysql-test/t/processlist.test b/mysql-test/main/processlist.test
index 4734c75c8d3..4734c75c8d3 100644
--- a/mysql-test/t/processlist.test
+++ b/mysql-test/main/processlist.test
diff --git a/mysql-test/r/profiling.result b/mysql-test/main/profiling.result
index 6590d89bc89..6590d89bc89 100644
--- a/mysql-test/r/profiling.result
+++ b/mysql-test/main/profiling.result
diff --git a/mysql-test/t/profiling.test b/mysql-test/main/profiling.test
index 1e1aada7c15..1e1aada7c15 100644
--- a/mysql-test/t/profiling.test
+++ b/mysql-test/main/profiling.test
diff --git a/mysql-test/r/progress_976225.result b/mysql-test/main/progress_976225.result
index a96b7b411e3..a96b7b411e3 100644
--- a/mysql-test/r/progress_976225.result
+++ b/mysql-test/main/progress_976225.result
diff --git a/mysql-test/t/progress_976225.test b/mysql-test/main/progress_976225.test
index 885f9d69de2..885f9d69de2 100644
--- a/mysql-test/t/progress_976225.test
+++ b/mysql-test/main/progress_976225.test
diff --git a/mysql-test/t/ps-master.opt b/mysql-test/main/ps-master.opt
index 2ae67eedad8..2ae67eedad8 100644
--- a/mysql-test/t/ps-master.opt
+++ b/mysql-test/main/ps-master.opt
diff --git a/mysql-test/r/ps.result b/mysql-test/main/ps.result
index 45e3f60e431..45e3f60e431 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/main/ps.result
diff --git a/mysql-test/t/ps.test b/mysql-test/main/ps.test
index a2f7d3c7bdc..59b157e2393 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/main/ps.test
@@ -3400,7 +3400,7 @@ DROP PROCEDURE p2;
 
 ###########################################################################
 
---source t/wl4435_generated.inc
+--source wl4435_generated.inc
 
 ###########################################################################
 
diff --git a/mysql-test/r/ps_10nestset.result b/mysql-test/main/ps_10nestset.result
index ff63485a5f9..ff63485a5f9 100644
--- a/mysql-test/r/ps_10nestset.result
+++ b/mysql-test/main/ps_10nestset.result
diff --git a/mysql-test/t/ps_10nestset.test b/mysql-test/main/ps_10nestset.test
index 46a88653da3..46a88653da3 100644
--- a/mysql-test/t/ps_10nestset.test
+++ b/mysql-test/main/ps_10nestset.test
diff --git a/mysql-test/r/ps_11bugs.result b/mysql-test/main/ps_11bugs.result
index 3bc7039583b..3bc7039583b 100644
--- a/mysql-test/r/ps_11bugs.result
+++ b/mysql-test/main/ps_11bugs.result
diff --git a/mysql-test/t/ps_11bugs.test b/mysql-test/main/ps_11bugs.test
index ccab833e878..ccab833e878 100644
--- a/mysql-test/t/ps_11bugs.test
+++ b/mysql-test/main/ps_11bugs.test
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/main/ps_1general.result
index 035372a1359..035372a1359 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/main/ps_1general.result
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/main/ps_1general.test
index 01a0164722d..01a0164722d 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/main/ps_1general.test
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/main/ps_2myisam.result
index 3906875da92..3906875da92 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/main/ps_2myisam.result
diff --git a/mysql-test/t/ps_2myisam.test b/mysql-test/main/ps_2myisam.test
index 0a335bd02a3..0a335bd02a3 100644
--- a/mysql-test/t/ps_2myisam.test
+++ b/mysql-test/main/ps_2myisam.test
diff --git a/mysql-test/t/ps_3innodb-master.opt b/mysql-test/main/ps_3innodb-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/ps_3innodb-master.opt
+++ b/mysql-test/main/ps_3innodb-master.opt
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/main/ps_3innodb.result
index 9f5c8956dd8..9f5c8956dd8 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/main/ps_3innodb.result
diff --git a/mysql-test/t/ps_3innodb.test b/mysql-test/main/ps_3innodb.test
index 10d2e7a9ae5..10d2e7a9ae5 100644
--- a/mysql-test/t/ps_3innodb.test
+++ b/mysql-test/main/ps_3innodb.test
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/main/ps_4heap.result
index 46b4d9c58e5..46b4d9c58e5 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/main/ps_4heap.result
diff --git a/mysql-test/t/ps_4heap.test b/mysql-test/main/ps_4heap.test
index 2c0b64b1503..2c0b64b1503 100644
--- a/mysql-test/t/ps_4heap.test
+++ b/mysql-test/main/ps_4heap.test
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/main/ps_5merge.result
index cc2f0f88b2a..cc2f0f88b2a 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/main/ps_5merge.result
diff --git a/mysql-test/t/ps_5merge.test b/mysql-test/main/ps_5merge.test
index adef6b51f0e..adef6b51f0e 100644
--- a/mysql-test/t/ps_5merge.test
+++ b/mysql-test/main/ps_5merge.test
diff --git a/mysql-test/r/ps_change_master.result b/mysql-test/main/ps_change_master.result
index 25069a537a5..25069a537a5 100644
--- a/mysql-test/r/ps_change_master.result
+++ b/mysql-test/main/ps_change_master.result
diff --git a/mysql-test/t/ps_change_master.test b/mysql-test/main/ps_change_master.test
index d756b8cd4fb..d756b8cd4fb 100644
--- a/mysql-test/t/ps_change_master.test
+++ b/mysql-test/main/ps_change_master.test
diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/main/ps_ddl.result
index 68acf50aee1..68acf50aee1 100644
--- a/mysql-test/r/ps_ddl.result
+++ b/mysql-test/main/ps_ddl.result
diff --git a/mysql-test/t/ps_ddl.test b/mysql-test/main/ps_ddl.test
index 90226d379bf..90226d379bf 100644
--- a/mysql-test/t/ps_ddl.test
+++ b/mysql-test/main/ps_ddl.test
diff --git a/mysql-test/r/ps_ddl1.result b/mysql-test/main/ps_ddl1.result
index 667cbed8a7a..667cbed8a7a 100644
--- a/mysql-test/r/ps_ddl1.result
+++ b/mysql-test/main/ps_ddl1.result
diff --git a/mysql-test/t/ps_ddl1.test b/mysql-test/main/ps_ddl1.test
index 0145d445a14..0145d445a14 100644
--- a/mysql-test/t/ps_ddl1.test
+++ b/mysql-test/main/ps_ddl1.test
diff --git a/mysql-test/r/ps_grant.result b/mysql-test/main/ps_grant.result
index 0e296cdc699..0e296cdc699 100644
--- a/mysql-test/r/ps_grant.result
+++ b/mysql-test/main/ps_grant.result
diff --git a/mysql-test/t/ps_grant.test b/mysql-test/main/ps_grant.test
index 3d59cc36de0..3d59cc36de0 100644
--- a/mysql-test/t/ps_grant.test
+++ b/mysql-test/main/ps_grant.test
diff --git a/mysql-test/r/ps_max_subselect-5113.result b/mysql-test/main/ps_max_subselect-5113.result
index 427ef628ead..427ef628ead 100644
--- a/mysql-test/r/ps_max_subselect-5113.result
+++ b/mysql-test/main/ps_max_subselect-5113.result
diff --git a/mysql-test/t/ps_max_subselect-5113.test b/mysql-test/main/ps_max_subselect-5113.test
index 255e81c1549..255e81c1549 100644
--- a/mysql-test/t/ps_max_subselect-5113.test
+++ b/mysql-test/main/ps_max_subselect-5113.test
diff --git a/mysql-test/r/ps_not_windows.result b/mysql-test/main/ps_not_windows.result
index e58b6ec5cad..e58b6ec5cad 100644
--- a/mysql-test/r/ps_not_windows.result
+++ b/mysql-test/main/ps_not_windows.result
diff --git a/mysql-test/t/ps_not_windows.test b/mysql-test/main/ps_not_windows.test
index 2003251dc55..2003251dc55 100644
--- a/mysql-test/t/ps_not_windows.test
+++ b/mysql-test/main/ps_not_windows.test
diff --git a/mysql-test/r/query_cache.result b/mysql-test/main/query_cache.result
index 9c010cbffc7..9c010cbffc7 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/main/query_cache.result
diff --git a/mysql-test/t/query_cache.test b/mysql-test/main/query_cache.test
index 1b1e24bc6f4..1b1e24bc6f4 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/main/query_cache.test
diff --git a/mysql-test/r/query_cache_28249.result b/mysql-test/main/query_cache_28249.result
index ba694179ceb..ba694179ceb 100644
--- a/mysql-test/r/query_cache_28249.result
+++ b/mysql-test/main/query_cache_28249.result
diff --git a/mysql-test/t/query_cache_28249.test b/mysql-test/main/query_cache_28249.test
index a08371fe576..a08371fe576 100644
--- a/mysql-test/t/query_cache_28249.test
+++ b/mysql-test/main/query_cache_28249.test
diff --git a/mysql-test/r/query_cache_debug.result b/mysql-test/main/query_cache_debug.result
index 2a54f073974..2a54f073974 100644
--- a/mysql-test/r/query_cache_debug.result
+++ b/mysql-test/main/query_cache_debug.result
diff --git a/mysql-test/t/query_cache_debug.test b/mysql-test/main/query_cache_debug.test
index 22ff1d45e63..22ff1d45e63 100644
--- a/mysql-test/t/query_cache_debug.test
+++ b/mysql-test/main/query_cache_debug.test
diff --git a/mysql-test/r/query_cache_innodb.result b/mysql-test/main/query_cache_innodb.result
index 643a065612f..643a065612f 100644
--- a/mysql-test/r/query_cache_innodb.result
+++ b/mysql-test/main/query_cache_innodb.result
diff --git a/mysql-test/t/query_cache_innodb.test b/mysql-test/main/query_cache_innodb.test
index ba62ec36c16..ba62ec36c16 100644
--- a/mysql-test/t/query_cache_innodb.test
+++ b/mysql-test/main/query_cache_innodb.test
diff --git a/mysql-test/r/query_cache_merge.result b/mysql-test/main/query_cache_merge.result
index e31ab05b396..e31ab05b396 100644
--- a/mysql-test/r/query_cache_merge.result
+++ b/mysql-test/main/query_cache_merge.result
diff --git a/mysql-test/t/query_cache_merge.test b/mysql-test/main/query_cache_merge.test
index 3046c4ecbfe..3046c4ecbfe 100644
--- a/mysql-test/t/query_cache_merge.test
+++ b/mysql-test/main/query_cache_merge.test
diff --git a/mysql-test/t/query_cache_notembedded-master.opt b/mysql-test/main/query_cache_notembedded-master.opt
index 871d6965726..871d6965726 100644
--- a/mysql-test/t/query_cache_notembedded-master.opt
+++ b/mysql-test/main/query_cache_notembedded-master.opt
diff --git a/mysql-test/r/query_cache_notembedded.result b/mysql-test/main/query_cache_notembedded.result
index bfb8f4d1ff7..bfb8f4d1ff7 100644
--- a/mysql-test/r/query_cache_notembedded.result
+++ b/mysql-test/main/query_cache_notembedded.result
diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/main/query_cache_notembedded.test
index dff6c2a139b..dff6c2a139b 100644
--- a/mysql-test/t/query_cache_notembedded.test
+++ b/mysql-test/main/query_cache_notembedded.test
diff --git a/mysql-test/r/query_cache_ps_no_prot.result b/mysql-test/main/query_cache_ps_no_prot.result
index ef1f92b597d..ef1f92b597d 100644
--- a/mysql-test/r/query_cache_ps_no_prot.result
+++ b/mysql-test/main/query_cache_ps_no_prot.result
diff --git a/mysql-test/t/query_cache_ps_no_prot.test b/mysql-test/main/query_cache_ps_no_prot.test
index 4b2bb842e34..4b2bb842e34 100644
--- a/mysql-test/t/query_cache_ps_no_prot.test
+++ b/mysql-test/main/query_cache_ps_no_prot.test
diff --git a/mysql-test/r/query_cache_ps_ps_prot.result b/mysql-test/main/query_cache_ps_ps_prot.result
index e3f2da1dbbe..e3f2da1dbbe 100644
--- a/mysql-test/r/query_cache_ps_ps_prot.result
+++ b/mysql-test/main/query_cache_ps_ps_prot.result
diff --git a/mysql-test/t/query_cache_ps_ps_prot.test b/mysql-test/main/query_cache_ps_ps_prot.test
index d431ce349d2..d431ce349d2 100644
--- a/mysql-test/t/query_cache_ps_ps_prot.test
+++ b/mysql-test/main/query_cache_ps_ps_prot.test
diff --git a/mysql-test/r/query_cache_with_views.result b/mysql-test/main/query_cache_with_views.result
index 763113dbac3..763113dbac3 100644
--- a/mysql-test/r/query_cache_with_views.result
+++ b/mysql-test/main/query_cache_with_views.result
diff --git a/mysql-test/t/query_cache_with_views.test b/mysql-test/main/query_cache_with_views.test
index 9b03d0e99d0..9b03d0e99d0 100644
--- a/mysql-test/t/query_cache_with_views.test
+++ b/mysql-test/main/query_cache_with_views.test
diff --git a/mysql-test/r/quick_select_4161.result b/mysql-test/main/quick_select_4161.result
index 30ae0a09edc..30ae0a09edc 100644
--- a/mysql-test/r/quick_select_4161.result
+++ b/mysql-test/main/quick_select_4161.result
diff --git a/mysql-test/t/quick_select_4161.test b/mysql-test/main/quick_select_4161.test
index 87323087622..87323087622 100644
--- a/mysql-test/t/quick_select_4161.test
+++ b/mysql-test/main/quick_select_4161.test
diff --git a/mysql-test/r/range.result b/mysql-test/main/range.result
index e2996b963bc..e2996b963bc 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/main/range.result
diff --git a/mysql-test/t/range.test b/mysql-test/main/range.test
index 36e0e32b28b..36e0e32b28b 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/main/range.test
diff --git a/mysql-test/r/range_innodb.result b/mysql-test/main/range_innodb.result
index 794e6c7b3cc..794e6c7b3cc 100644
--- a/mysql-test/r/range_innodb.result
+++ b/mysql-test/main/range_innodb.result
diff --git a/mysql-test/t/range_innodb.test b/mysql-test/main/range_innodb.test
index f76794814ef..f76794814ef 100644
--- a/mysql-test/t/range_innodb.test
+++ b/mysql-test/main/range_innodb.test
diff --git a/mysql-test/r/range_interrupted-13751.result b/mysql-test/main/range_interrupted-13751.result
index f4f995721ad..f4f995721ad 100644
--- a/mysql-test/r/range_interrupted-13751.result
+++ b/mysql-test/main/range_interrupted-13751.result
diff --git a/mysql-test/t/range_interrupted-13751.test b/mysql-test/main/range_interrupted-13751.test
index 000a46383e8..000a46383e8 100644
--- a/mysql-test/t/range_interrupted-13751.test
+++ b/mysql-test/main/range_interrupted-13751.test
diff --git a/mysql-test/r/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result
index 629d183bee7..629d183bee7 100644
--- a/mysql-test/r/range_mrr_icp.result
+++ b/mysql-test/main/range_mrr_icp.result
diff --git a/mysql-test/t/range_mrr_icp.test b/mysql-test/main/range_mrr_icp.test
index 724da8aea3b..29e7af321db 100644
--- a/mysql-test/t/range_mrr_icp.test
+++ b/mysql-test/main/range_mrr_icp.test
@@ -1,7 +1,7 @@
 set @mrr_icp_extra_tmp=@@optimizer_switch;
 set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
 
---source t/range.test
+--source range.test
 
 set optimizer_switch=@mrr_icp_extra_tmp;
 
diff --git a/mysql-test/r/range_vs_index_merge.result b/mysql-test/main/range_vs_index_merge.result
index bc46a4fdd0b..bc46a4fdd0b 100644
--- a/mysql-test/r/range_vs_index_merge.result
+++ b/mysql-test/main/range_vs_index_merge.result
diff --git a/mysql-test/t/range_vs_index_merge.test b/mysql-test/main/range_vs_index_merge.test
index 84b87579e85..84b87579e85 100644
--- a/mysql-test/t/range_vs_index_merge.test
+++ b/mysql-test/main/range_vs_index_merge.test
diff --git a/mysql-test/r/range_vs_index_merge_innodb.result b/mysql-test/main/range_vs_index_merge_innodb.result
index ce90f522d6e..ce90f522d6e 100644
--- a/mysql-test/r/range_vs_index_merge_innodb.result
+++ b/mysql-test/main/range_vs_index_merge_innodb.result
diff --git a/mysql-test/t/range_vs_index_merge_innodb.test b/mysql-test/main/range_vs_index_merge_innodb.test
index e85cd044ece..31870ccd9c6 100644
--- a/mysql-test/t/range_vs_index_merge_innodb.test
+++ b/mysql-test/main/range_vs_index_merge_innodb.test
@@ -2,6 +2,6 @@
 
 SET SESSION STORAGE_ENGINE='InnoDB';
 
---source t/range_vs_index_merge.test
+--source range_vs_index_merge.test
 
 SET SESSION STORAGE_ENGINE=DEFAULT;
diff --git a/mysql-test/r/read_many_rows_innodb.result b/mysql-test/main/read_many_rows_innodb.result
index 24f9a2d54a5..24f9a2d54a5 100644
--- a/mysql-test/r/read_many_rows_innodb.result
+++ b/mysql-test/main/read_many_rows_innodb.result
diff --git a/mysql-test/t/read_many_rows_innodb.test b/mysql-test/main/read_many_rows_innodb.test
index ed86275447f..ed86275447f 100644
--- a/mysql-test/t/read_many_rows_innodb.test
+++ b/mysql-test/main/read_many_rows_innodb.test
diff --git a/mysql-test/r/read_only.result b/mysql-test/main/read_only.result
index 2029413c0f0..2029413c0f0 100644
--- a/mysql-test/r/read_only.result
+++ b/mysql-test/main/read_only.result
diff --git a/mysql-test/t/read_only.test b/mysql-test/main/read_only.test
index a05f813346e..a05f813346e 100644
--- a/mysql-test/t/read_only.test
+++ b/mysql-test/main/read_only.test
diff --git a/mysql-test/r/read_only_innodb.result b/mysql-test/main/read_only_innodb.result
index abfc5322ed0..abfc5322ed0 100644
--- a/mysql-test/r/read_only_innodb.result
+++ b/mysql-test/main/read_only_innodb.result
diff --git a/mysql-test/t/read_only_innodb.test b/mysql-test/main/read_only_innodb.test
index 9ba3ccaca07..9ba3ccaca07 100644
--- a/mysql-test/t/read_only_innodb.test
+++ b/mysql-test/main/read_only_innodb.test
diff --git a/mysql-test/r/rename.result b/mysql-test/main/rename.result
index ff8566abe02..ff8566abe02 100644
--- a/mysql-test/r/rename.result
+++ b/mysql-test/main/rename.result
diff --git a/mysql-test/t/rename.test b/mysql-test/main/rename.test
index a55bc845acc..a55bc845acc 100644
--- a/mysql-test/t/rename.test
+++ b/mysql-test/main/rename.test
diff --git a/mysql-test/r/renamedb.result b/mysql-test/main/renamedb.result
index f774c3d1ab6..f774c3d1ab6 100644
--- a/mysql-test/r/renamedb.result
+++ b/mysql-test/main/renamedb.result
diff --git a/mysql-test/t/renamedb.test b/mysql-test/main/renamedb.test
index 71d0c127058..71d0c127058 100644
--- a/mysql-test/t/renamedb.test
+++ b/mysql-test/main/renamedb.test
diff --git a/mysql-test/r/reopen_temp_table.result b/mysql-test/main/reopen_temp_table.result
index 217aa3c8bad..217aa3c8bad 100644
--- a/mysql-test/r/reopen_temp_table.result
+++ b/mysql-test/main/reopen_temp_table.result
diff --git a/mysql-test/t/reopen_temp_table.test b/mysql-test/main/reopen_temp_table.test
index 2aa6caa1655..2aa6caa1655 100644
--- a/mysql-test/t/reopen_temp_table.test
+++ b/mysql-test/main/reopen_temp_table.test
diff --git a/mysql-test/r/repair.result b/mysql-test/main/repair.result
index 75d7525ee71..75d7525ee71 100644
--- a/mysql-test/r/repair.result
+++ b/mysql-test/main/repair.result
diff --git a/mysql-test/t/repair.test b/mysql-test/main/repair.test
index 5494e370133..5494e370133 100644
--- a/mysql-test/t/repair.test
+++ b/mysql-test/main/repair.test
diff --git a/mysql-test/r/repair_symlink-5543.result b/mysql-test/main/repair_symlink-5543.result
index c77e7162a51..c77e7162a51 100644
--- a/mysql-test/r/repair_symlink-5543.result
+++ b/mysql-test/main/repair_symlink-5543.result
diff --git a/mysql-test/t/repair_symlink-5543.test b/mysql-test/main/repair_symlink-5543.test
index 4c120334d05..4c120334d05 100644
--- a/mysql-test/t/repair_symlink-5543.test
+++ b/mysql-test/main/repair_symlink-5543.test
diff --git a/mysql-test/r/replace.result b/mysql-test/main/replace.result
index 9590a97e10a..9590a97e10a 100644
--- a/mysql-test/r/replace.result
+++ b/mysql-test/main/replace.result
diff --git a/mysql-test/t/replace.test b/mysql-test/main/replace.test
index 3f2569b0c62..3f2569b0c62 100644
--- a/mysql-test/t/replace.test
+++ b/mysql-test/main/replace.test
diff --git a/mysql-test/r/rollback.result b/mysql-test/main/rollback.result
index e562b73c981..e562b73c981 100644
--- a/mysql-test/r/rollback.result
+++ b/mysql-test/main/rollback.result
diff --git a/mysql-test/t/rollback.test b/mysql-test/main/rollback.test
index 3b8ad901907..3b8ad901907 100644
--- a/mysql-test/t/rollback.test
+++ b/mysql-test/main/rollback.test
diff --git a/mysql-test/r/round.result b/mysql-test/main/round.result
index a3e9f18843d..a3e9f18843d 100644
--- a/mysql-test/r/round.result
+++ b/mysql-test/main/round.result
diff --git a/mysql-test/t/round.test b/mysql-test/main/round.test
index 4ba65c08fcf..4ba65c08fcf 100644
--- a/mysql-test/t/round.test
+++ b/mysql-test/main/round.test
diff --git a/mysql-test/t/row-checksum-master.opt b/mysql-test/main/row-checksum-master.opt
index 990e4941ae9..990e4941ae9 100644
--- a/mysql-test/t/row-checksum-master.opt
+++ b/mysql-test/main/row-checksum-master.opt
diff --git a/mysql-test/t/row-checksum-old-master.opt b/mysql-test/main/row-checksum-old-master.opt
index 40027795fff..40027795fff 100644
--- a/mysql-test/t/row-checksum-old-master.opt
+++ b/mysql-test/main/row-checksum-old-master.opt
diff --git a/mysql-test/r/row-checksum-old.result b/mysql-test/main/row-checksum-old.result
index 87cd1cc89ed..87cd1cc89ed 100644
--- a/mysql-test/r/row-checksum-old.result
+++ b/mysql-test/main/row-checksum-old.result
diff --git a/mysql-test/t/row-checksum-old.test b/mysql-test/main/row-checksum-old.test
index 71188ddf432..8c1503cf01f 100644
--- a/mysql-test/t/row-checksum-old.test
+++ b/mysql-test/main/row-checksum-old.test
@@ -1,4 +1,4 @@
 #
 # Run row-checksum.test with old mode
 #
---source t/row-checksum.test
+--source row-checksum.test
diff --git a/mysql-test/t/row-checksum.opt b/mysql-test/main/row-checksum.opt
index 977b569a781..977b569a781 100644
--- a/mysql-test/t/row-checksum.opt
+++ b/mysql-test/main/row-checksum.opt
diff --git a/mysql-test/r/row-checksum.result b/mysql-test/main/row-checksum.result
index f2e687f8b6e..f2e687f8b6e 100644
--- a/mysql-test/r/row-checksum.result
+++ b/mysql-test/main/row-checksum.result
diff --git a/mysql-test/t/row-checksum.test b/mysql-test/main/row-checksum.test
index 82efcf3ef93..82efcf3ef93 100644
--- a/mysql-test/t/row-checksum.test
+++ b/mysql-test/main/row-checksum.test
diff --git a/mysql-test/r/row.result b/mysql-test/main/row.result
index 7483f37970f..7483f37970f 100644
--- a/mysql-test/r/row.result
+++ b/mysql-test/main/row.result
diff --git a/mysql-test/t/row.test b/mysql-test/main/row.test
index 80c61c414bf..80c61c414bf 100644
--- a/mysql-test/t/row.test
+++ b/mysql-test/main/row.test
diff --git a/mysql-test/r/rowid_order_innodb.result b/mysql-test/main/rowid_order_innodb.result
index dc339304041..dc339304041 100644
--- a/mysql-test/r/rowid_order_innodb.result
+++ b/mysql-test/main/rowid_order_innodb.result
diff --git a/mysql-test/t/rowid_order_innodb.test b/mysql-test/main/rowid_order_innodb.test
index 152eb28d388..152eb28d388 100644
--- a/mysql-test/t/rowid_order_innodb.test
+++ b/mysql-test/main/rowid_order_innodb.test
diff --git a/mysql-test/r/rpl_mysqldump_slave.result b/mysql-test/main/rpl_mysqldump_slave.result
index 903b671178f..903b671178f 100644
--- a/mysql-test/r/rpl_mysqldump_slave.result
+++ b/mysql-test/main/rpl_mysqldump_slave.result
diff --git a/mysql-test/t/rpl_mysqldump_slave.test b/mysql-test/main/rpl_mysqldump_slave.test
index 345bdb82535..345bdb82535 100644
--- a/mysql-test/t/rpl_mysqldump_slave.test
+++ b/mysql-test/main/rpl_mysqldump_slave.test
diff --git a/mysql-test/r/schema.result b/mysql-test/main/schema.result
index 6d8271a49f3..6d8271a49f3 100644
--- a/mysql-test/r/schema.result
+++ b/mysql-test/main/schema.result
diff --git a/mysql-test/t/schema.test b/mysql-test/main/schema.test
index 8f9047e2e3f..8f9047e2e3f 100644
--- a/mysql-test/t/schema.test
+++ b/mysql-test/main/schema.test
diff --git a/mysql-test/r/second_frac-9175.result b/mysql-test/main/second_frac-9175.result
index dbf268b5c3b..dbf268b5c3b 100644
--- a/mysql-test/r/second_frac-9175.result
+++ b/mysql-test/main/second_frac-9175.result
diff --git a/mysql-test/t/second_frac-9175.test b/mysql-test/main/second_frac-9175.test
index 91baf997459..91baf997459 100644
--- a/mysql-test/t/second_frac-9175.test
+++ b/mysql-test/main/second_frac-9175.test
diff --git a/mysql-test/t/secure_file_priv_win-master.opt b/mysql-test/main/secure_file_priv_win-master.opt
index e9a43a5584d..e9a43a5584d 100644
--- a/mysql-test/t/secure_file_priv_win-master.opt
+++ b/mysql-test/main/secure_file_priv_win-master.opt
diff --git a/mysql-test/r/secure_file_priv_win.result b/mysql-test/main/secure_file_priv_win.result
index d456c24d20c..d456c24d20c 100644
--- a/mysql-test/r/secure_file_priv_win.result
+++ b/mysql-test/main/secure_file_priv_win.result
diff --git a/mysql-test/t/secure_file_priv_win.test b/mysql-test/main/secure_file_priv_win.test
index a12510974ce..a12510974ce 100644
--- a/mysql-test/t/secure_file_priv_win.test
+++ b/mysql-test/main/secure_file_priv_win.test
diff --git a/mysql-test/r/select.result b/mysql-test/main/select.result
index 9b6a570717b..9b6a570717b 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/main/select.result
diff --git a/mysql-test/t/select.test b/mysql-test/main/select.test
index 52ef4aa2111..52ef4aa2111 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/main/select.test
diff --git a/mysql-test/r/select_debug.result b/mysql-test/main/select_debug.result
index 55882ad337a..55882ad337a 100644
--- a/mysql-test/r/select_debug.result
+++ b/mysql-test/main/select_debug.result
diff --git a/mysql-test/t/select_debug.test b/mysql-test/main/select_debug.test
index 49415400db3..49415400db3 100644
--- a/mysql-test/t/select_debug.test
+++ b/mysql-test/main/select_debug.test
diff --git a/mysql-test/r/select_found.result b/mysql-test/main/select_found.result
index 2c37c2d28d8..2c37c2d28d8 100644
--- a/mysql-test/r/select_found.result
+++ b/mysql-test/main/select_found.result
diff --git a/mysql-test/t/select_found.test b/mysql-test/main/select_found.test
index 33613697722..33613697722 100644
--- a/mysql-test/t/select_found.test
+++ b/mysql-test/main/select_found.test
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/main/select_jcl6.result
index d78fad15da1..d78fad15da1 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/main/select_jcl6.result
diff --git a/mysql-test/t/select_jcl6.test b/mysql-test/main/select_jcl6.test
index f7c1aa988c7..120752fe12c 100644
--- a/mysql-test/t/select_jcl6.test
+++ b/mysql-test/main/select_jcl6.test
@@ -14,7 +14,7 @@ show variables like 'join_cache_level';
 set @optimizer_switch_for_select_test=@@optimizer_switch;
 set @join_cache_level_for_select_test=@@join_cache_level;
 
---source t/select.test
+--source select.test
 
 set join_cache_level=default;
 show variables like 'join_cache_level';
diff --git a/mysql-test/t/select_pkeycache-master.opt b/mysql-test/main/select_pkeycache-master.opt
index a6c0f247334..a6c0f247334 100644
--- a/mysql-test/t/select_pkeycache-master.opt
+++ b/mysql-test/main/select_pkeycache-master.opt
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/main/select_pkeycache.result
index 9b6a570717b..9b6a570717b 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/main/select_pkeycache.result
diff --git a/mysql-test/t/select_pkeycache.test b/mysql-test/main/select_pkeycache.test
index e0ee96e937a..2887e70cf12 100644
--- a/mysql-test/t/select_pkeycache.test
+++ b/mysql-test/main/select_pkeycache.test
@@ -5,4 +5,4 @@
 # The result is expected the same as for select.test
 #
 
---source t/select.test
+--source select.test
diff --git a/mysql-test/r/select_safe.result b/mysql-test/main/select_safe.result
index 60364b8c4ec..60364b8c4ec 100644
--- a/mysql-test/r/select_safe.result
+++ b/mysql-test/main/select_safe.result
diff --git a/mysql-test/t/select_safe.test b/mysql-test/main/select_safe.test
index c76e337cd10..c76e337cd10 100644
--- a/mysql-test/t/select_safe.test
+++ b/mysql-test/main/select_safe.test
diff --git a/mysql-test/r/selectivity.result b/mysql-test/main/selectivity.result
index 9cb6ee3e9bf..9cb6ee3e9bf 100644
--- a/mysql-test/r/selectivity.result
+++ b/mysql-test/main/selectivity.result
diff --git a/mysql-test/t/selectivity.test b/mysql-test/main/selectivity.test
index 3e60f242083..3e60f242083 100644
--- a/mysql-test/t/selectivity.test
+++ b/mysql-test/main/selectivity.test
diff --git a/mysql-test/r/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result
index 236647c6091..236647c6091 100644
--- a/mysql-test/r/selectivity_innodb.result
+++ b/mysql-test/main/selectivity_innodb.result
diff --git a/mysql-test/t/selectivity_innodb.test b/mysql-test/main/selectivity_innodb.test
index e2dba034363..e2dba034363 100644
--- a/mysql-test/t/selectivity_innodb.test
+++ b/mysql-test/main/selectivity_innodb.test
diff --git a/mysql-test/r/selectivity_no_engine.result b/mysql-test/main/selectivity_no_engine.result
index 7fc3c6e9909..7fc3c6e9909 100644
--- a/mysql-test/r/selectivity_no_engine.result
+++ b/mysql-test/main/selectivity_no_engine.result
diff --git a/mysql-test/t/selectivity_no_engine.test b/mysql-test/main/selectivity_no_engine.test
index 2a31c01ed97..2a31c01ed97 100644
--- a/mysql-test/t/selectivity_no_engine.test
+++ b/mysql-test/main/selectivity_no_engine.test
diff --git a/mysql-test/r/servers.result b/mysql-test/main/servers.result
index 585f0f62af0..585f0f62af0 100644
--- a/mysql-test/r/servers.result
+++ b/mysql-test/main/servers.result
diff --git a/mysql-test/t/servers.test b/mysql-test/main/servers.test
index 645206c376e..645206c376e 100644
--- a/mysql-test/t/servers.test
+++ b/mysql-test/main/servers.test
diff --git a/mysql-test/r/set_password_plugin-9835.result b/mysql-test/main/set_password_plugin-9835.result
index 3cc723957d8..3cc723957d8 100644
--- a/mysql-test/r/set_password_plugin-9835.result
+++ b/mysql-test/main/set_password_plugin-9835.result
diff --git a/mysql-test/t/set_password_plugin-9835.test b/mysql-test/main/set_password_plugin-9835.test
index 6afccd74f9d..6afccd74f9d 100644
--- a/mysql-test/t/set_password_plugin-9835.test
+++ b/mysql-test/main/set_password_plugin-9835.test
diff --git a/mysql-test/r/set_statement.result b/mysql-test/main/set_statement.result
index c34e1171899..c34e1171899 100644
--- a/mysql-test/r/set_statement.result
+++ b/mysql-test/main/set_statement.result
diff --git a/mysql-test/t/set_statement.test b/mysql-test/main/set_statement.test
index cc361553cfd..cc361553cfd 100644
--- a/mysql-test/t/set_statement.test
+++ b/mysql-test/main/set_statement.test
diff --git a/mysql-test/r/set_statement_debug.result b/mysql-test/main/set_statement_debug.result
index 39c5af2c623..39c5af2c623 100644
--- a/mysql-test/r/set_statement_debug.result
+++ b/mysql-test/main/set_statement_debug.result
diff --git a/mysql-test/t/set_statement_debug.test b/mysql-test/main/set_statement_debug.test
index 7089733ab4f..7089733ab4f 100644
--- a/mysql-test/t/set_statement_debug.test
+++ b/mysql-test/main/set_statement_debug.test
diff --git a/mysql-test/r/set_statement_notembedded.result b/mysql-test/main/set_statement_notembedded.result
index 561c30d49ac..561c30d49ac 100644
--- a/mysql-test/r/set_statement_notembedded.result
+++ b/mysql-test/main/set_statement_notembedded.result
diff --git a/mysql-test/t/set_statement_notembedded.test b/mysql-test/main/set_statement_notembedded.test
index 7bb8f5e1aab..7bb8f5e1aab 100644
--- a/mysql-test/t/set_statement_notembedded.test
+++ b/mysql-test/main/set_statement_notembedded.test
diff --git a/mysql-test/r/set_statement_notembedded_binlog.result b/mysql-test/main/set_statement_notembedded_binlog.result
index 50fcde5a1cb..50fcde5a1cb 100644
--- a/mysql-test/r/set_statement_notembedded_binlog.result
+++ b/mysql-test/main/set_statement_notembedded_binlog.result
diff --git a/mysql-test/t/set_statement_notembedded_binlog.test b/mysql-test/main/set_statement_notembedded_binlog.test
index b0c00008d4f..b0c00008d4f 100644
--- a/mysql-test/t/set_statement_notembedded_binlog.test
+++ b/mysql-test/main/set_statement_notembedded_binlog.test
diff --git a/mysql-test/r/set_statement_profiling.result b/mysql-test/main/set_statement_profiling.result
index 1f17c345680..1f17c345680 100644
--- a/mysql-test/r/set_statement_profiling.result
+++ b/mysql-test/main/set_statement_profiling.result
diff --git a/mysql-test/t/set_statement_profiling.test b/mysql-test/main/set_statement_profiling.test
index 6ef64d2f18c..6ef64d2f18c 100644
--- a/mysql-test/t/set_statement_profiling.test
+++ b/mysql-test/main/set_statement_profiling.test
diff --git a/mysql-test/t/shm-master.opt b/mysql-test/main/shm-master.opt
index d71395213b1..d71395213b1 100644
--- a/mysql-test/t/shm-master.opt
+++ b/mysql-test/main/shm-master.opt
diff --git a/mysql-test/r/shm.result b/mysql-test/main/shm.result
index 65187b6b19b..65187b6b19b 100644
--- a/mysql-test/r/shm.result
+++ b/mysql-test/main/shm.result
diff --git a/mysql-test/t/shm.test b/mysql-test/main/shm.test
index 346ce49476e..346ce49476e 100644
--- a/mysql-test/t/shm.test
+++ b/mysql-test/main/shm.test
diff --git a/mysql-test/r/show.result b/mysql-test/main/show.result
index 3dd7af5de05..3dd7af5de05 100644
--- a/mysql-test/r/show.result
+++ b/mysql-test/main/show.result
diff --git a/mysql-test/t/show.test b/mysql-test/main/show.test
index 3101f443264..3101f443264 100644
--- a/mysql-test/t/show.test
+++ b/mysql-test/main/show.test
diff --git a/mysql-test/r/show_bad_definer-5553.result b/mysql-test/main/show_bad_definer-5553.result
index 173c88bd196..173c88bd196 100644
--- a/mysql-test/r/show_bad_definer-5553.result
+++ b/mysql-test/main/show_bad_definer-5553.result
diff --git a/mysql-test/t/show_bad_definer-5553.test b/mysql-test/main/show_bad_definer-5553.test
index 7c7f253ae7d..7c7f253ae7d 100644
--- a/mysql-test/t/show_bad_definer-5553.test
+++ b/mysql-test/main/show_bad_definer-5553.test
diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/main/show_check-master.opt
index af474d42e8d..af474d42e8d 100644
--- a/mysql-test/t/show_check-master.opt
+++ b/mysql-test/main/show_check-master.opt
diff --git a/mysql-test/r/show_check.result b/mysql-test/main/show_check.result
index 5083f1e615b..5083f1e615b 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/main/show_check.result
diff --git a/mysql-test/t/show_check.test b/mysql-test/main/show_check.test
index a24fa632ea5..a24fa632ea5 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/main/show_check.test
diff --git a/mysql-test/r/show_create_user.result b/mysql-test/main/show_create_user.result
index 63013eca074..63013eca074 100644
--- a/mysql-test/r/show_create_user.result
+++ b/mysql-test/main/show_create_user.result
diff --git a/mysql-test/t/show_create_user.test b/mysql-test/main/show_create_user.test
index a10c8aeeda6..a10c8aeeda6 100644
--- a/mysql-test/t/show_create_user.test
+++ b/mysql-test/main/show_create_user.test
diff --git a/mysql-test/r/show_explain.result b/mysql-test/main/show_explain.result
index 0819ae5ba37..0819ae5ba37 100644
--- a/mysql-test/r/show_explain.result
+++ b/mysql-test/main/show_explain.result
diff --git a/mysql-test/t/show_explain.test b/mysql-test/main/show_explain.test
index 6615ff66737..6615ff66737 100644
--- a/mysql-test/t/show_explain.test
+++ b/mysql-test/main/show_explain.test
diff --git a/mysql-test/r/show_explain_non_select.result b/mysql-test/main/show_explain_non_select.result
index 6076a848e22..6076a848e22 100644
--- a/mysql-test/r/show_explain_non_select.result
+++ b/mysql-test/main/show_explain_non_select.result
diff --git a/mysql-test/t/show_explain_non_select.test b/mysql-test/main/show_explain_non_select.test
index 21b16739141..21b16739141 100644
--- a/mysql-test/t/show_explain_non_select.test
+++ b/mysql-test/main/show_explain_non_select.test
diff --git a/mysql-test/r/show_explain_ps.result b/mysql-test/main/show_explain_ps.result
index fae432e830e..fae432e830e 100644
--- a/mysql-test/r/show_explain_ps.result
+++ b/mysql-test/main/show_explain_ps.result
diff --git a/mysql-test/t/show_explain_ps.test b/mysql-test/main/show_explain_ps.test
index b43cd559e09..b43cd559e09 100644
--- a/mysql-test/t/show_explain_ps.test
+++ b/mysql-test/main/show_explain_ps.test
diff --git a/mysql-test/r/show_function_with_pad_char_to_full_length.result b/mysql-test/main/show_function_with_pad_char_to_full_length.result
index 785cab7b3e6..785cab7b3e6 100644
--- a/mysql-test/r/show_function_with_pad_char_to_full_length.result
+++ b/mysql-test/main/show_function_with_pad_char_to_full_length.result
diff --git a/mysql-test/t/show_function_with_pad_char_to_full_length.test b/mysql-test/main/show_function_with_pad_char_to_full_length.test
index f47f36294d4..f47f36294d4 100644
--- a/mysql-test/t/show_function_with_pad_char_to_full_length.test
+++ b/mysql-test/main/show_function_with_pad_char_to_full_length.test
diff --git a/mysql-test/r/show_grants_with_plugin-7985.result b/mysql-test/main/show_grants_with_plugin-7985.result
index 81880e5cc40..81880e5cc40 100644
--- a/mysql-test/r/show_grants_with_plugin-7985.result
+++ b/mysql-test/main/show_grants_with_plugin-7985.result
diff --git a/mysql-test/t/show_grants_with_plugin-7985.test b/mysql-test/main/show_grants_with_plugin-7985.test
index 84f71c72667..84f71c72667 100644
--- a/mysql-test/t/show_grants_with_plugin-7985.test
+++ b/mysql-test/main/show_grants_with_plugin-7985.test
diff --git a/mysql-test/r/show_profile.result b/mysql-test/main/show_profile.result
index 67a07f6cfc9..67a07f6cfc9 100644
--- a/mysql-test/r/show_profile.result
+++ b/mysql-test/main/show_profile.result
diff --git a/mysql-test/t/show_profile.test b/mysql-test/main/show_profile.test
index c20b29c40bf..c20b29c40bf 100644
--- a/mysql-test/t/show_profile.test
+++ b/mysql-test/main/show_profile.test
diff --git a/mysql-test/r/show_row_order-9226.result b/mysql-test/main/show_row_order-9226.result
index b8c8de647ef..b8c8de647ef 100644
--- a/mysql-test/r/show_row_order-9226.result
+++ b/mysql-test/main/show_row_order-9226.result
diff --git a/mysql-test/t/show_row_order-9226.test b/mysql-test/main/show_row_order-9226.test
index 06df24061ec..06df24061ec 100644
--- a/mysql-test/t/show_row_order-9226.test
+++ b/mysql-test/main/show_row_order-9226.test
diff --git a/mysql-test/r/shutdown.result b/mysql-test/main/shutdown.result
index 7a69f58ffd9..7a69f58ffd9 100644
--- a/mysql-test/r/shutdown.result
+++ b/mysql-test/main/shutdown.result
diff --git a/mysql-test/t/shutdown.test b/mysql-test/main/shutdown.test
index e423725177b..e423725177b 100644
--- a/mysql-test/t/shutdown.test
+++ b/mysql-test/main/shutdown.test
diff --git a/mysql-test/r/sighup-6580.result b/mysql-test/main/sighup-6580.result
index b77a7c6407f..b77a7c6407f 100644
--- a/mysql-test/r/sighup-6580.result
+++ b/mysql-test/main/sighup-6580.result
diff --git a/mysql-test/t/sighup-6580.test b/mysql-test/main/sighup-6580.test
index c89b3d20a0a..c89b3d20a0a 100644
--- a/mysql-test/t/sighup-6580.test
+++ b/mysql-test/main/sighup-6580.test
diff --git a/mysql-test/r/signal.result b/mysql-test/main/signal.result
index 905842bfb1c..905842bfb1c 100644
--- a/mysql-test/r/signal.result
+++ b/mysql-test/main/signal.result
diff --git a/mysql-test/t/signal.test b/mysql-test/main/signal.test
index cdb5796f1da..cdb5796f1da 100644
--- a/mysql-test/t/signal.test
+++ b/mysql-test/main/signal.test
diff --git a/mysql-test/r/signal_code.result b/mysql-test/main/signal_code.result
index 32192251fe9..32192251fe9 100644
--- a/mysql-test/r/signal_code.result
+++ b/mysql-test/main/signal_code.result
diff --git a/mysql-test/t/signal_code.test b/mysql-test/main/signal_code.test
index 6922a447c6a..6922a447c6a 100644
--- a/mysql-test/t/signal_code.test
+++ b/mysql-test/main/signal_code.test
diff --git a/mysql-test/r/signal_demo1.result b/mysql-test/main/signal_demo1.result
index 752f23a48d6..752f23a48d6 100644
--- a/mysql-test/r/signal_demo1.result
+++ b/mysql-test/main/signal_demo1.result
diff --git a/mysql-test/t/signal_demo1.test b/mysql-test/main/signal_demo1.test
index 62020b8f3fd..62020b8f3fd 100644
--- a/mysql-test/t/signal_demo1.test
+++ b/mysql-test/main/signal_demo1.test
diff --git a/mysql-test/r/signal_demo2.result b/mysql-test/main/signal_demo2.result
index 5c8ac328a4a..5c8ac328a4a 100644
--- a/mysql-test/r/signal_demo2.result
+++ b/mysql-test/main/signal_demo2.result
diff --git a/mysql-test/t/signal_demo2.test b/mysql-test/main/signal_demo2.test
index 30f5cef715c..30f5cef715c 100644
--- a/mysql-test/t/signal_demo2.test
+++ b/mysql-test/main/signal_demo2.test
diff --git a/mysql-test/r/signal_demo3.result b/mysql-test/main/signal_demo3.result
index fe425f6412d..fe425f6412d 100644
--- a/mysql-test/r/signal_demo3.result
+++ b/mysql-test/main/signal_demo3.result
diff --git a/mysql-test/t/signal_demo3.test b/mysql-test/main/signal_demo3.test
index a685111c3c1..a685111c3c1 100644
--- a/mysql-test/t/signal_demo3.test
+++ b/mysql-test/main/signal_demo3.test
diff --git a/mysql-test/r/signal_sqlmode.result b/mysql-test/main/signal_sqlmode.result
index 8fed85eb4a9..8fed85eb4a9 100644
--- a/mysql-test/r/signal_sqlmode.result
+++ b/mysql-test/main/signal_sqlmode.result
diff --git a/mysql-test/t/signal_sqlmode.test b/mysql-test/main/signal_sqlmode.test
index 2b311fd1ab1..2b311fd1ab1 100644
--- a/mysql-test/t/signal_sqlmode.test
+++ b/mysql-test/main/signal_sqlmode.test
diff --git a/mysql-test/r/simultaneous_assignment.result b/mysql-test/main/simultaneous_assignment.result
index 67cb58ba6af..67cb58ba6af 100644
--- a/mysql-test/r/simultaneous_assignment.result
+++ b/mysql-test/main/simultaneous_assignment.result
diff --git a/mysql-test/t/simultaneous_assignment.test b/mysql-test/main/simultaneous_assignment.test
index a21e33346d6..a21e33346d6 100644
--- a/mysql-test/t/simultaneous_assignment.test
+++ b/mysql-test/main/simultaneous_assignment.test
diff --git a/mysql-test/r/single_delete_update.result b/mysql-test/main/single_delete_update.result
index 85e79f53c89..85e79f53c89 100644
--- a/mysql-test/r/single_delete_update.result
+++ b/mysql-test/main/single_delete_update.result
diff --git a/mysql-test/t/single_delete_update.test b/mysql-test/main/single_delete_update.test
index ec939641ea3..ec939641ea3 100644
--- a/mysql-test/t/single_delete_update.test
+++ b/mysql-test/main/single_delete_update.test
diff --git a/mysql-test/r/single_delete_update_innodb.result b/mysql-test/main/single_delete_update_innodb.result
index aca40974054..aca40974054 100644
--- a/mysql-test/r/single_delete_update_innodb.result
+++ b/mysql-test/main/single_delete_update_innodb.result
diff --git a/mysql-test/t/single_delete_update_innodb.test b/mysql-test/main/single_delete_update_innodb.test
index 7e7817d4dd6..7e7817d4dd6 100644
--- a/mysql-test/t/single_delete_update_innodb.test
+++ b/mysql-test/main/single_delete_update_innodb.test
diff --git a/mysql-test/t/skip_grants-master.opt b/mysql-test/main/skip_grants-master.opt
index 5699a3387b8..5699a3387b8 100644
--- a/mysql-test/t/skip_grants-master.opt
+++ b/mysql-test/main/skip_grants-master.opt
diff --git a/mysql-test/r/skip_grants.result b/mysql-test/main/skip_grants.result
index de263074b61..de263074b61 100644
--- a/mysql-test/r/skip_grants.result
+++ b/mysql-test/main/skip_grants.result
diff --git a/mysql-test/t/skip_grants.test b/mysql-test/main/skip_grants.test
index 5f79404e7e4..5f79404e7e4 100644
--- a/mysql-test/t/skip_grants.test
+++ b/mysql-test/main/skip_grants.test
diff --git a/mysql-test/t/skip_log_bin-master.opt b/mysql-test/main/skip_log_bin-master.opt
index 9ebccecc95e..9ebccecc95e 100644
--- a/mysql-test/t/skip_log_bin-master.opt
+++ b/mysql-test/main/skip_log_bin-master.opt
diff --git a/mysql-test/r/skip_log_bin.result b/mysql-test/main/skip_log_bin.result
index 2fdd88ff526..2fdd88ff526 100644
--- a/mysql-test/r/skip_log_bin.result
+++ b/mysql-test/main/skip_log_bin.result
diff --git a/mysql-test/t/skip_log_bin.test b/mysql-test/main/skip_log_bin.test
index 6175b2cf7d3..6175b2cf7d3 100644
--- a/mysql-test/t/skip_log_bin.test
+++ b/mysql-test/main/skip_log_bin.test
diff --git a/mysql-test/t/skip_name_resolve-master.opt b/mysql-test/main/skip_name_resolve-master.opt
index ab6ca1731f5..ab6ca1731f5 100644
--- a/mysql-test/t/skip_name_resolve-master.opt
+++ b/mysql-test/main/skip_name_resolve-master.opt
diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/main/skip_name_resolve.result
index 1362e482717..1362e482717 100644
--- a/mysql-test/r/skip_name_resolve.result
+++ b/mysql-test/main/skip_name_resolve.result
diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/main/skip_name_resolve.test
index b0c5118f970..b0c5118f970 100644
--- a/mysql-test/t/skip_name_resolve.test
+++ b/mysql-test/main/skip_name_resolve.test
diff --git a/mysql-test/r/slowlog_enospace-10508.result b/mysql-test/main/slowlog_enospace-10508.result
index f39bfa2f00e..f39bfa2f00e 100644
--- a/mysql-test/r/slowlog_enospace-10508.result
+++ b/mysql-test/main/slowlog_enospace-10508.result
diff --git a/mysql-test/t/slowlog_enospace-10508.test b/mysql-test/main/slowlog_enospace-10508.test
index b2c26a5984d..b2c26a5984d 100644
--- a/mysql-test/t/slowlog_enospace-10508.test
+++ b/mysql-test/main/slowlog_enospace-10508.test
diff --git a/mysql-test/r/sp-anchor-row-type-cursor.result b/mysql-test/main/sp-anchor-row-type-cursor.result
index add771c534c..add771c534c 100644
--- a/mysql-test/r/sp-anchor-row-type-cursor.result
+++ b/mysql-test/main/sp-anchor-row-type-cursor.result
diff --git a/mysql-test/t/sp-anchor-row-type-cursor.test b/mysql-test/main/sp-anchor-row-type-cursor.test
index 7089175507c..7089175507c 100644
--- a/mysql-test/t/sp-anchor-row-type-cursor.test
+++ b/mysql-test/main/sp-anchor-row-type-cursor.test
diff --git a/mysql-test/r/sp-anchor-row-type-table.result b/mysql-test/main/sp-anchor-row-type-table.result
index 28a5180e6c9..28a5180e6c9 100644
--- a/mysql-test/r/sp-anchor-row-type-table.result
+++ b/mysql-test/main/sp-anchor-row-type-table.result
diff --git a/mysql-test/t/sp-anchor-row-type-table.test b/mysql-test/main/sp-anchor-row-type-table.test
index 3f04dc68586..3f04dc68586 100644
--- a/mysql-test/t/sp-anchor-row-type-table.test
+++ b/mysql-test/main/sp-anchor-row-type-table.test
diff --git a/mysql-test/r/sp-anchor-type.result b/mysql-test/main/sp-anchor-type.result
index b2de14bca1c..b2de14bca1c 100644
--- a/mysql-test/r/sp-anchor-type.result
+++ b/mysql-test/main/sp-anchor-type.result
diff --git a/mysql-test/t/sp-anchor-type.test b/mysql-test/main/sp-anchor-type.test
index 7f952d626e0..7f952d626e0 100644
--- a/mysql-test/t/sp-anchor-type.test
+++ b/mysql-test/main/sp-anchor-type.test
diff --git a/mysql-test/r/sp-big.result b/mysql-test/main/sp-big.result
index e12136eb36d..e12136eb36d 100644
--- a/mysql-test/r/sp-big.result
+++ b/mysql-test/main/sp-big.result
diff --git a/mysql-test/t/sp-big.test b/mysql-test/main/sp-big.test
index 4220541697e..4220541697e 100644
--- a/mysql-test/t/sp-big.test
+++ b/mysql-test/main/sp-big.test
diff --git a/mysql-test/r/sp-bugs.result b/mysql-test/main/sp-bugs.result
index 3db1e68321c..3db1e68321c 100644
--- a/mysql-test/r/sp-bugs.result
+++ b/mysql-test/main/sp-bugs.result
diff --git a/mysql-test/t/sp-bugs.test b/mysql-test/main/sp-bugs.test
index 3239dfeaeec..3239dfeaeec 100644
--- a/mysql-test/t/sp-bugs.test
+++ b/mysql-test/main/sp-bugs.test
diff --git a/mysql-test/r/sp-bugs2.result b/mysql-test/main/sp-bugs2.result
index 3e48f0fb5d2..3e48f0fb5d2 100644
--- a/mysql-test/r/sp-bugs2.result
+++ b/mysql-test/main/sp-bugs2.result
diff --git a/mysql-test/t/sp-bugs2.test b/mysql-test/main/sp-bugs2.test
index 2579e3485c6..2579e3485c6 100644
--- a/mysql-test/t/sp-bugs2.test
+++ b/mysql-test/main/sp-bugs2.test
diff --git a/mysql-test/r/sp-code.result b/mysql-test/main/sp-code.result
index 3a4dc9db6f8..3a4dc9db6f8 100644
--- a/mysql-test/r/sp-code.result
+++ b/mysql-test/main/sp-code.result
diff --git a/mysql-test/t/sp-code.test b/mysql-test/main/sp-code.test
index 1f2f5191f0a..1f2f5191f0a 100644
--- a/mysql-test/t/sp-code.test
+++ b/mysql-test/main/sp-code.test
diff --git a/mysql-test/r/sp-cursor.result b/mysql-test/main/sp-cursor.result
index 1f8cb7f0635..1f8cb7f0635 100644
--- a/mysql-test/r/sp-cursor.result
+++ b/mysql-test/main/sp-cursor.result
diff --git a/mysql-test/t/sp-cursor.test b/mysql-test/main/sp-cursor.test
index 2e7a72cf8d0..2e7a72cf8d0 100644
--- a/mysql-test/t/sp-cursor.test
+++ b/mysql-test/main/sp-cursor.test
diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/main/sp-destruct.result
index a5f96882a37..a5f96882a37 100644
--- a/mysql-test/r/sp-destruct.result
+++ b/mysql-test/main/sp-destruct.result
diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/main/sp-destruct.test
index 607c733b492..607c733b492 100644
--- a/mysql-test/t/sp-destruct.test
+++ b/mysql-test/main/sp-destruct.test
diff --git a/mysql-test/r/sp-dynamic.result b/mysql-test/main/sp-dynamic.result
index 9fa3bea1108..9fa3bea1108 100644
--- a/mysql-test/r/sp-dynamic.result
+++ b/mysql-test/main/sp-dynamic.result
diff --git a/mysql-test/t/sp-dynamic.test b/mysql-test/main/sp-dynamic.test
index 3a467e26818..3a467e26818 100644
--- a/mysql-test/t/sp-dynamic.test
+++ b/mysql-test/main/sp-dynamic.test
diff --git a/mysql-test/r/sp-error.result b/mysql-test/main/sp-error.result
index fc43bdf17e9..fc43bdf17e9 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/main/sp-error.result
diff --git a/mysql-test/t/sp-error.test b/mysql-test/main/sp-error.test
index 0e16948f438..0e16948f438 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/main/sp-error.test
diff --git a/mysql-test/r/sp-fib.result b/mysql-test/main/sp-fib.result
index a26e104c1e8..a26e104c1e8 100644
--- a/mysql-test/r/sp-fib.result
+++ b/mysql-test/main/sp-fib.result
diff --git a/mysql-test/t/sp-fib.test b/mysql-test/main/sp-fib.test
index 24a51b99c2d..24a51b99c2d 100644
--- a/mysql-test/t/sp-fib.test
+++ b/mysql-test/main/sp-fib.test
diff --git a/mysql-test/r/sp-for-loop.result b/mysql-test/main/sp-for-loop.result
index 0da09586df5..0da09586df5 100644
--- a/mysql-test/r/sp-for-loop.result
+++ b/mysql-test/main/sp-for-loop.result
diff --git a/mysql-test/t/sp-for-loop.test b/mysql-test/main/sp-for-loop.test
index 6350e9fb9d3..6350e9fb9d3 100644
--- a/mysql-test/t/sp-for-loop.test
+++ b/mysql-test/main/sp-for-loop.test
diff --git a/mysql-test/r/sp-group.result b/mysql-test/main/sp-group.result
index ce8dccfa2c9..ce8dccfa2c9 100644
--- a/mysql-test/r/sp-group.result
+++ b/mysql-test/main/sp-group.result
diff --git a/mysql-test/t/sp-group.test b/mysql-test/main/sp-group.test
index 2083ac97595..2083ac97595 100644
--- a/mysql-test/t/sp-group.test
+++ b/mysql-test/main/sp-group.test
diff --git a/mysql-test/r/sp-innodb.result b/mysql-test/main/sp-innodb.result
index 2c3bc7dc4f3..2c3bc7dc4f3 100644
--- a/mysql-test/r/sp-innodb.result
+++ b/mysql-test/main/sp-innodb.result
diff --git a/mysql-test/t/sp-innodb.test b/mysql-test/main/sp-innodb.test
index 23715166a02..23715166a02 100644
--- a/mysql-test/t/sp-innodb.test
+++ b/mysql-test/main/sp-innodb.test
diff --git a/mysql-test/r/sp-lock.result b/mysql-test/main/sp-lock.result
index acf951f6676..acf951f6676 100644
--- a/mysql-test/r/sp-lock.result
+++ b/mysql-test/main/sp-lock.result
diff --git a/mysql-test/t/sp-lock.test b/mysql-test/main/sp-lock.test
index 83ea07d4bda..83ea07d4bda 100644
--- a/mysql-test/t/sp-lock.test
+++ b/mysql-test/main/sp-lock.test
diff --git a/mysql-test/r/sp-no-code.result b/mysql-test/main/sp-no-code.result
index 762b481a7cb..762b481a7cb 100644
--- a/mysql-test/r/sp-no-code.result
+++ b/mysql-test/main/sp-no-code.result
diff --git a/mysql-test/t/sp-no-code.test b/mysql-test/main/sp-no-code.test
index 47a1a126627..47a1a126627 100644
--- a/mysql-test/t/sp-no-code.test
+++ b/mysql-test/main/sp-no-code.test
diff --git a/mysql-test/r/sp-prelocking.result b/mysql-test/main/sp-prelocking.result
index eb47cc21f41..eb47cc21f41 100644
--- a/mysql-test/r/sp-prelocking.result
+++ b/mysql-test/main/sp-prelocking.result
diff --git a/mysql-test/t/sp-prelocking.test b/mysql-test/main/sp-prelocking.test
index 38cbd5aa110..38cbd5aa110 100644
--- a/mysql-test/t/sp-prelocking.test
+++ b/mysql-test/main/sp-prelocking.test
diff --git a/mysql-test/t/sp-row-vs-var.inc b/mysql-test/main/sp-row-vs-var.inc
index 54d323f7341..54d323f7341 100644
--- a/mysql-test/t/sp-row-vs-var.inc
+++ b/mysql-test/main/sp-row-vs-var.inc
diff --git a/mysql-test/r/sp-row.result b/mysql-test/main/sp-row.result
index d3be7c2a9b9..d3be7c2a9b9 100644
--- a/mysql-test/r/sp-row.result
+++ b/mysql-test/main/sp-row.result
diff --git a/mysql-test/t/sp-row.test b/mysql-test/main/sp-row.test
index 837e24c89c0..837e24c89c0 100644
--- a/mysql-test/t/sp-row.test
+++ b/mysql-test/main/sp-row.test
diff --git a/mysql-test/r/sp-security-anchor-type.result b/mysql-test/main/sp-security-anchor-type.result
index 4ee846f9f2e..4ee846f9f2e 100644
--- a/mysql-test/r/sp-security-anchor-type.result
+++ b/mysql-test/main/sp-security-anchor-type.result
diff --git a/mysql-test/t/sp-security-anchor-type.test b/mysql-test/main/sp-security-anchor-type.test
index e61d5e38052..e61d5e38052 100644
--- a/mysql-test/t/sp-security-anchor-type.test
+++ b/mysql-test/main/sp-security-anchor-type.test
diff --git a/mysql-test/r/sp-security.result b/mysql-test/main/sp-security.result
index 882072ff7c7..882072ff7c7 100644
--- a/mysql-test/r/sp-security.result
+++ b/mysql-test/main/sp-security.result
diff --git a/mysql-test/t/sp-security.test b/mysql-test/main/sp-security.test
index 059a5dd0fa8..059a5dd0fa8 100644
--- a/mysql-test/t/sp-security.test
+++ b/mysql-test/main/sp-security.test
diff --git a/mysql-test/r/sp-threads.result b/mysql-test/main/sp-threads.result
index 886cbd812f2..886cbd812f2 100644
--- a/mysql-test/r/sp-threads.result
+++ b/mysql-test/main/sp-threads.result
diff --git a/mysql-test/t/sp-threads.test b/mysql-test/main/sp-threads.test
index 7a6d1258331..7a6d1258331 100644
--- a/mysql-test/t/sp-threads.test
+++ b/mysql-test/main/sp-threads.test
diff --git a/mysql-test/r/sp-ucs2.result b/mysql-test/main/sp-ucs2.result
index b8cc5dfd73d..b8cc5dfd73d 100644
--- a/mysql-test/r/sp-ucs2.result
+++ b/mysql-test/main/sp-ucs2.result
diff --git a/mysql-test/t/sp-ucs2.test b/mysql-test/main/sp-ucs2.test
index 3532169e5a1..3532169e5a1 100644
--- a/mysql-test/t/sp-ucs2.test
+++ b/mysql-test/main/sp-ucs2.test
diff --git a/mysql-test/r/sp-vars.result b/mysql-test/main/sp-vars.result
index ac1566d0c6e..ac1566d0c6e 100644
--- a/mysql-test/r/sp-vars.result
+++ b/mysql-test/main/sp-vars.result
diff --git a/mysql-test/t/sp-vars.test b/mysql-test/main/sp-vars.test
index 57d5563e609..57d5563e609 100644
--- a/mysql-test/t/sp-vars.test
+++ b/mysql-test/main/sp-vars.test
diff --git a/mysql-test/r/sp.result b/mysql-test/main/sp.result
index 5e457fae1e0..5e457fae1e0 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/main/sp.result
diff --git a/mysql-test/t/sp.test b/mysql-test/main/sp.test
index c97f6dbba68..c97f6dbba68 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/main/sp.test
diff --git a/mysql-test/r/sp_gis.result b/mysql-test/main/sp_gis.result
index 7a76507754f..7a76507754f 100644
--- a/mysql-test/r/sp_gis.result
+++ b/mysql-test/main/sp_gis.result
diff --git a/mysql-test/t/sp_gis.test b/mysql-test/main/sp_gis.test
index 51ed78b27d5..51ed78b27d5 100644
--- a/mysql-test/t/sp_gis.test
+++ b/mysql-test/main/sp_gis.test
diff --git a/mysql-test/r/sp_missing_4665.result b/mysql-test/main/sp_missing_4665.result
index 47587c180c6..47587c180c6 100644
--- a/mysql-test/r/sp_missing_4665.result
+++ b/mysql-test/main/sp_missing_4665.result
diff --git a/mysql-test/t/sp_missing_4665.test b/mysql-test/main/sp_missing_4665.test
index 19e845e58c7..19e845e58c7 100644
--- a/mysql-test/t/sp_missing_4665.test
+++ b/mysql-test/main/sp_missing_4665.test
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/main/sp_notembedded.result
index 190f8f78d23..190f8f78d23 100644
--- a/mysql-test/r/sp_notembedded.result
+++ b/mysql-test/main/sp_notembedded.result
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/main/sp_notembedded.test
index 41bfd871c39..41bfd871c39 100644
--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/main/sp_notembedded.test
diff --git a/mysql-test/r/sp_stress_case.result b/mysql-test/main/sp_stress_case.result
index 8ec68363c8d..8ec68363c8d 100644
--- a/mysql-test/r/sp_stress_case.result
+++ b/mysql-test/main/sp_stress_case.result
diff --git a/mysql-test/t/sp_stress_case.test b/mysql-test/main/sp_stress_case.test
index 1b5bd8991a9..1b5bd8991a9 100644
--- a/mysql-test/t/sp_stress_case.test
+++ b/mysql-test/main/sp_stress_case.test
diff --git a/mysql-test/r/sp_sync.result b/mysql-test/main/sp_sync.result
index d6c170712a7..d6c170712a7 100644
--- a/mysql-test/r/sp_sync.result
+++ b/mysql-test/main/sp_sync.result
diff --git a/mysql-test/t/sp_sync.test b/mysql-test/main/sp_sync.test
index a5682fc572f..a5682fc572f 100644
--- a/mysql-test/t/sp_sync.test
+++ b/mysql-test/main/sp_sync.test
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/main/sp_trans.result
index ef802279c9c..ef802279c9c 100644
--- a/mysql-test/r/sp_trans.result
+++ b/mysql-test/main/sp_trans.result
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/main/sp_trans.test
index a9759b99269..a9759b99269 100644
--- a/mysql-test/t/sp_trans.test
+++ b/mysql-test/main/sp_trans.test
diff --git a/mysql-test/r/sp_trans_log.result b/mysql-test/main/sp_trans_log.result
index b72e8332fad..b72e8332fad 100644
--- a/mysql-test/r/sp_trans_log.result
+++ b/mysql-test/main/sp_trans_log.result
diff --git a/mysql-test/t/sp_trans_log.test b/mysql-test/main/sp_trans_log.test
index deea6e6d9b6..deea6e6d9b6 100644
--- a/mysql-test/t/sp_trans_log.test
+++ b/mysql-test/main/sp_trans_log.test
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/main/sql_mode.result
index 02574c1c545..02574c1c545 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/main/sql_mode.result
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/main/sql_mode.test
index 9f38dc935e7..9f38dc935e7 100644
--- a/mysql-test/t/sql_mode.test
+++ b/mysql-test/main/sql_mode.test
diff --git a/mysql-test/r/ssl-big.result b/mysql-test/main/ssl-big.result
index 54c61507ade..54c61507ade 100644
--- a/mysql-test/r/ssl-big.result
+++ b/mysql-test/main/ssl-big.result
diff --git a/mysql-test/t/ssl-big.test b/mysql-test/main/ssl-big.test
index 59825a148a4..59825a148a4 100644
--- a/mysql-test/t/ssl-big.test
+++ b/mysql-test/main/ssl-big.test
diff --git a/mysql-test/r/ssl-crl-revoked-crl.result b/mysql-test/main/ssl-crl-revoked-crl.result
index 8ecc6a509d3..8ecc6a509d3 100644
--- a/mysql-test/r/ssl-crl-revoked-crl.result
+++ b/mysql-test/main/ssl-crl-revoked-crl.result
diff --git a/mysql-test/r/ssl.result b/mysql-test/main/ssl.result
index 5de9e5174d8..5de9e5174d8 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/main/ssl.result
diff --git a/mysql-test/t/ssl.test b/mysql-test/main/ssl.test
index f2ac288db7a..f2ac288db7a 100644
--- a/mysql-test/t/ssl.test
+++ b/mysql-test/main/ssl.test
diff --git a/mysql-test/r/ssl_7937,nossl.result b/mysql-test/main/ssl_7937,nossl.result
index 72693233bc8..72693233bc8 100644
--- a/mysql-test/r/ssl_7937,nossl.result
+++ b/mysql-test/main/ssl_7937,nossl.result
diff --git a/mysql-test/t/ssl_7937.combinations b/mysql-test/main/ssl_7937.combinations
index 71b134e229a..71b134e229a 100644
--- a/mysql-test/t/ssl_7937.combinations
+++ b/mysql-test/main/ssl_7937.combinations
diff --git a/mysql-test/r/ssl_7937.result b/mysql-test/main/ssl_7937.result
index a94ca3b3529..a94ca3b3529 100644
--- a/mysql-test/r/ssl_7937.result
+++ b/mysql-test/main/ssl_7937.result
diff --git a/mysql-test/t/ssl_7937.test b/mysql-test/main/ssl_7937.test
index aa8cd225d7b..aa8cd225d7b 100644
--- a/mysql-test/t/ssl_7937.test
+++ b/mysql-test/main/ssl_7937.test
diff --git a/mysql-test/t/ssl_8k_key-master.opt b/mysql-test/main/ssl_8k_key-master.opt
index 856b33e95ee..856b33e95ee 100644
--- a/mysql-test/t/ssl_8k_key-master.opt
+++ b/mysql-test/main/ssl_8k_key-master.opt
diff --git a/mysql-test/r/ssl_8k_key.result b/mysql-test/main/ssl_8k_key.result
index ff9d0cce9dc..ff9d0cce9dc 100644
--- a/mysql-test/r/ssl_8k_key.result
+++ b/mysql-test/main/ssl_8k_key.result
diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/main/ssl_8k_key.test
index edfead46658..edfead46658 100644
--- a/mysql-test/t/ssl_8k_key.test
+++ b/mysql-test/main/ssl_8k_key.test
diff --git a/mysql-test/r/ssl_and_innodb.result b/mysql-test/main/ssl_and_innodb.result
index 71373fc4033..71373fc4033 100644
--- a/mysql-test/r/ssl_and_innodb.result
+++ b/mysql-test/main/ssl_and_innodb.result
diff --git a/mysql-test/t/ssl_and_innodb.test b/mysql-test/main/ssl_and_innodb.test
index 4966f05b37b..4966f05b37b 100644
--- a/mysql-test/t/ssl_and_innodb.test
+++ b/mysql-test/main/ssl_and_innodb.test
diff --git a/mysql-test/r/ssl_ca.result b/mysql-test/main/ssl_ca.result
index afffe4e4dff..afffe4e4dff 100644
--- a/mysql-test/r/ssl_ca.result
+++ b/mysql-test/main/ssl_ca.result
diff --git a/mysql-test/t/ssl_ca.test b/mysql-test/main/ssl_ca.test
index 106da140130..106da140130 100644
--- a/mysql-test/t/ssl_ca.test
+++ b/mysql-test/main/ssl_ca.test
diff --git a/mysql-test/r/ssl_cert_verify.result b/mysql-test/main/ssl_cert_verify.result
index 1da77329509..1da77329509 100644
--- a/mysql-test/r/ssl_cert_verify.result
+++ b/mysql-test/main/ssl_cert_verify.result
diff --git a/mysql-test/t/ssl_cert_verify.test b/mysql-test/main/ssl_cert_verify.test
index 83f621b7ca9..83f621b7ca9 100644
--- a/mysql-test/t/ssl_cert_verify.test
+++ b/mysql-test/main/ssl_cert_verify.test
diff --git a/mysql-test/t/ssl_cipher-master.opt b/mysql-test/main/ssl_cipher-master.opt
index d750c46ba5c..d750c46ba5c 100644
--- a/mysql-test/t/ssl_cipher-master.opt
+++ b/mysql-test/main/ssl_cipher-master.opt
diff --git a/mysql-test/r/ssl_cipher.result b/mysql-test/main/ssl_cipher.result
index 79998dfca80..79998dfca80 100644
--- a/mysql-test/r/ssl_cipher.result
+++ b/mysql-test/main/ssl_cipher.result
diff --git a/mysql-test/t/ssl_cipher.test b/mysql-test/main/ssl_cipher.test
index cf249343324..cf249343324 100644
--- a/mysql-test/t/ssl_cipher.test
+++ b/mysql-test/main/ssl_cipher.test
diff --git a/mysql-test/r/ssl_compress.result b/mysql-test/main/ssl_compress.result
index 4e37cc68a24..4e37cc68a24 100644
--- a/mysql-test/r/ssl_compress.result
+++ b/mysql-test/main/ssl_compress.result
diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/main/ssl_compress.test
index 588d4555db8..588d4555db8 100644
--- a/mysql-test/t/ssl_compress.test
+++ b/mysql-test/main/ssl_compress.test
diff --git a/mysql-test/r/ssl_connect.result b/mysql-test/main/ssl_connect.result
index 6ab9fedbf2d..6ab9fedbf2d 100644
--- a/mysql-test/r/ssl_connect.result
+++ b/mysql-test/main/ssl_connect.result
diff --git a/mysql-test/t/ssl_connect.test b/mysql-test/main/ssl_connect.test
index ce57e4f746d..ce57e4f746d 100644
--- a/mysql-test/t/ssl_connect.test
+++ b/mysql-test/main/ssl_connect.test
diff --git a/mysql-test/t/ssl_crl-master.opt b/mysql-test/main/ssl_crl-master.opt
index 8500f8cd6e7..8500f8cd6e7 100644
--- a/mysql-test/t/ssl_crl-master.opt
+++ b/mysql-test/main/ssl_crl-master.opt
diff --git a/mysql-test/r/ssl_crl.result b/mysql-test/main/ssl_crl.result
index 570dd9cab06..570dd9cab06 100644
--- a/mysql-test/r/ssl_crl.result
+++ b/mysql-test/main/ssl_crl.result
diff --git a/mysql-test/t/ssl_crl.test b/mysql-test/main/ssl_crl.test
index 65c14837e50..65c14837e50 100644
--- a/mysql-test/t/ssl_crl.test
+++ b/mysql-test/main/ssl_crl.test
diff --git a/mysql-test/t/ssl_crl_clients-master.opt b/mysql-test/main/ssl_crl_clients-master.opt
index fa885a61a0c..fa885a61a0c 100644
--- a/mysql-test/t/ssl_crl_clients-master.opt
+++ b/mysql-test/main/ssl_crl_clients-master.opt
diff --git a/mysql-test/r/ssl_crl_clients-valid.result b/mysql-test/main/ssl_crl_clients-valid.result
index f3f47d51846..f3f47d51846 100644
--- a/mysql-test/r/ssl_crl_clients-valid.result
+++ b/mysql-test/main/ssl_crl_clients-valid.result
diff --git a/mysql-test/r/ssl_crl_clients.result b/mysql-test/main/ssl_crl_clients.result
index 3bb9b4ee7e2..3bb9b4ee7e2 100644
--- a/mysql-test/r/ssl_crl_clients.result
+++ b/mysql-test/main/ssl_crl_clients.result
diff --git a/mysql-test/t/ssl_crl_clients.test b/mysql-test/main/ssl_crl_clients.test
index 7c05f498fbe..7c05f498fbe 100644
--- a/mysql-test/t/ssl_crl_clients.test
+++ b/mysql-test/main/ssl_crl_clients.test
diff --git a/mysql-test/t/ssl_crl_clients_valid-master.opt b/mysql-test/main/ssl_crl_clients_valid-master.opt
index 258df564eba..258df564eba 100644
--- a/mysql-test/t/ssl_crl_clients_valid-master.opt
+++ b/mysql-test/main/ssl_crl_clients_valid-master.opt
diff --git a/mysql-test/r/ssl_crl_clients_valid.result b/mysql-test/main/ssl_crl_clients_valid.result
index 32ee72d5c39..32ee72d5c39 100644
--- a/mysql-test/r/ssl_crl_clients_valid.result
+++ b/mysql-test/main/ssl_crl_clients_valid.result
diff --git a/mysql-test/t/ssl_crl_clients_valid.test b/mysql-test/main/ssl_crl_clients_valid.test
index f08fbf09397..f08fbf09397 100644
--- a/mysql-test/t/ssl_crl_clients_valid.test
+++ b/mysql-test/main/ssl_crl_clients_valid.test
diff --git a/mysql-test/t/ssl_crl_clrpath-master.opt b/mysql-test/main/ssl_crl_clrpath-master.opt
index b1f486a322b..b1f486a322b 100644
--- a/mysql-test/t/ssl_crl_clrpath-master.opt
+++ b/mysql-test/main/ssl_crl_clrpath-master.opt
diff --git a/mysql-test/r/ssl_crl_clrpath.result b/mysql-test/main/ssl_crl_clrpath.result
index b4b4d13eca1..b4b4d13eca1 100644
--- a/mysql-test/r/ssl_crl_clrpath.result
+++ b/mysql-test/main/ssl_crl_clrpath.result
diff --git a/mysql-test/t/ssl_crl_clrpath.test b/mysql-test/main/ssl_crl_clrpath.test
index 50d84ad175e..50d84ad175e 100644
--- a/mysql-test/t/ssl_crl_clrpath.test
+++ b/mysql-test/main/ssl_crl_clrpath.test
diff --git a/mysql-test/t/ssl_timeout-9836.opt b/mysql-test/main/ssl_timeout-9836.opt
index 7a2696875b8..7a2696875b8 100644
--- a/mysql-test/t/ssl_timeout-9836.opt
+++ b/mysql-test/main/ssl_timeout-9836.opt
diff --git a/mysql-test/r/ssl_timeout-9836.result b/mysql-test/main/ssl_timeout-9836.result
index 7e21a8a435b..7e21a8a435b 100644
--- a/mysql-test/r/ssl_timeout-9836.result
+++ b/mysql-test/main/ssl_timeout-9836.result
diff --git a/mysql-test/t/ssl_timeout-9836.test b/mysql-test/main/ssl_timeout-9836.test
index 5b57917f3b8..5b57917f3b8 100644
--- a/mysql-test/t/ssl_timeout-9836.test
+++ b/mysql-test/main/ssl_timeout-9836.test
diff --git a/mysql-test/r/ssl_timeout.result b/mysql-test/main/ssl_timeout.result
index 3c94a9927da..3c94a9927da 100644
--- a/mysql-test/r/ssl_timeout.result
+++ b/mysql-test/main/ssl_timeout.result
diff --git a/mysql-test/t/ssl_timeout.test b/mysql-test/main/ssl_timeout.test
index 430fe7130de..430fe7130de 100644
--- a/mysql-test/t/ssl_timeout.test
+++ b/mysql-test/main/ssl_timeout.test
diff --git a/mysql-test/r/stack-crash.result b/mysql-test/main/stack-crash.result
index 62870db79f3..62870db79f3 100644
--- a/mysql-test/r/stack-crash.result
+++ b/mysql-test/main/stack-crash.result
diff --git a/mysql-test/t/stack-crash.test b/mysql-test/main/stack-crash.test
index e4feb95a332..e4feb95a332 100644
--- a/mysql-test/t/stack-crash.test
+++ b/mysql-test/main/stack-crash.test
diff --git a/mysql-test/r/stat_tables-enospc.result b/mysql-test/main/stat_tables-enospc.result
index f0d76f04eee..f0d76f04eee 100644
--- a/mysql-test/r/stat_tables-enospc.result
+++ b/mysql-test/main/stat_tables-enospc.result
diff --git a/mysql-test/t/stat_tables-enospc.test b/mysql-test/main/stat_tables-enospc.test
index 12e42f6adc0..12e42f6adc0 100644
--- a/mysql-test/t/stat_tables-enospc.test
+++ b/mysql-test/main/stat_tables-enospc.test
diff --git a/mysql-test/r/stat_tables.result b/mysql-test/main/stat_tables.result
index fcced761283..fcced761283 100644
--- a/mysql-test/r/stat_tables.result
+++ b/mysql-test/main/stat_tables.result
diff --git a/mysql-test/t/stat_tables.test b/mysql-test/main/stat_tables.test
index 4cbaa9e27c8..4cbaa9e27c8 100644
--- a/mysql-test/t/stat_tables.test
+++ b/mysql-test/main/stat_tables.test
diff --git a/mysql-test/r/stat_tables_disabled.result b/mysql-test/main/stat_tables_disabled.result
index f57abc34e0c..f57abc34e0c 100644
--- a/mysql-test/r/stat_tables_disabled.result
+++ b/mysql-test/main/stat_tables_disabled.result
diff --git a/mysql-test/t/stat_tables_disabled.test b/mysql-test/main/stat_tables_disabled.test
index c9d923f903b..c9d923f903b 100644
--- a/mysql-test/t/stat_tables_disabled.test
+++ b/mysql-test/main/stat_tables_disabled.test
diff --git a/mysql-test/r/stat_tables_innodb.result b/mysql-test/main/stat_tables_innodb.result
index 42443bfcb72..42443bfcb72 100644
--- a/mysql-test/r/stat_tables_innodb.result
+++ b/mysql-test/main/stat_tables_innodb.result
diff --git a/mysql-test/t/stat_tables_innodb.test b/mysql-test/main/stat_tables_innodb.test
index 04e81de8f9d..04e81de8f9d 100644
--- a/mysql-test/t/stat_tables_innodb.test
+++ b/mysql-test/main/stat_tables_innodb.test
diff --git a/mysql-test/r/stat_tables_innodb_debug.result b/mysql-test/main/stat_tables_innodb_debug.result
index e0c4c78cd29..e0c4c78cd29 100644
--- a/mysql-test/r/stat_tables_innodb_debug.result
+++ b/mysql-test/main/stat_tables_innodb_debug.result
diff --git a/mysql-test/t/stat_tables_innodb_debug.test b/mysql-test/main/stat_tables_innodb_debug.test
index f3652fc2312..f3652fc2312 100644
--- a/mysql-test/t/stat_tables_innodb_debug.test
+++ b/mysql-test/main/stat_tables_innodb_debug.test
diff --git a/mysql-test/r/stat_tables_myisam_debug.result b/mysql-test/main/stat_tables_myisam_debug.result
index ae9a001bdfa..ae9a001bdfa 100644
--- a/mysql-test/r/stat_tables_myisam_debug.result
+++ b/mysql-test/main/stat_tables_myisam_debug.result
diff --git a/mysql-test/t/stat_tables_myisam_debug.test b/mysql-test/main/stat_tables_myisam_debug.test
index e8ef44325b9..e8ef44325b9 100644
--- a/mysql-test/t/stat_tables_myisam_debug.test
+++ b/mysql-test/main/stat_tables_myisam_debug.test
diff --git a/mysql-test/r/stat_tables_par.result b/mysql-test/main/stat_tables_par.result
index 09ee2bbf16a..09ee2bbf16a 100644
--- a/mysql-test/r/stat_tables_par.result
+++ b/mysql-test/main/stat_tables_par.result
diff --git a/mysql-test/t/stat_tables_par.test b/mysql-test/main/stat_tables_par.test
index 9d4038911ff..9d4038911ff 100644
--- a/mysql-test/t/stat_tables_par.test
+++ b/mysql-test/main/stat_tables_par.test
diff --git a/mysql-test/r/stat_tables_par_innodb.result b/mysql-test/main/stat_tables_par_innodb.result
index 54579aff990..54579aff990 100644
--- a/mysql-test/r/stat_tables_par_innodb.result
+++ b/mysql-test/main/stat_tables_par_innodb.result
diff --git a/mysql-test/t/stat_tables_par_innodb.test b/mysql-test/main/stat_tables_par_innodb.test
index fd5833e4aaf..fd5833e4aaf 100644
--- a/mysql-test/t/stat_tables_par_innodb.test
+++ b/mysql-test/main/stat_tables_par_innodb.test
diff --git a/mysql-test/r/stat_tables_partition.result b/mysql-test/main/stat_tables_partition.result
index 12ae2570272..12ae2570272 100644
--- a/mysql-test/r/stat_tables_partition.result
+++ b/mysql-test/main/stat_tables_partition.result
diff --git a/mysql-test/t/stat_tables_partition.test b/mysql-test/main/stat_tables_partition.test
index 1316e5cca11..1316e5cca11 100644
--- a/mysql-test/t/stat_tables_partition.test
+++ b/mysql-test/main/stat_tables_partition.test
diff --git a/mysql-test/r/stat_tables_rbr.result b/mysql-test/main/stat_tables_rbr.result
index 7ae7ade4398..7ae7ade4398 100644
--- a/mysql-test/r/stat_tables_rbr.result
+++ b/mysql-test/main/stat_tables_rbr.result
diff --git a/mysql-test/t/stat_tables_rbr.test b/mysql-test/main/stat_tables_rbr.test
index 29f7c4e6622..29f7c4e6622 100644
--- a/mysql-test/t/stat_tables_rbr.test
+++ b/mysql-test/main/stat_tables_rbr.test
diff --git a/mysql-test/r/stat_tables_repl.result b/mysql-test/main/stat_tables_repl.result
index 43c9fa554c9..43c9fa554c9 100644
--- a/mysql-test/r/stat_tables_repl.result
+++ b/mysql-test/main/stat_tables_repl.result
diff --git a/mysql-test/t/stat_tables_repl.test b/mysql-test/main/stat_tables_repl.test
index ac24c9dcbd7..ac24c9dcbd7 100644
--- a/mysql-test/t/stat_tables_repl.test
+++ b/mysql-test/main/stat_tables_repl.test
diff --git a/mysql-test/r/statistics.result b/mysql-test/main/statistics.result
index ffaaf09acc8..ffaaf09acc8 100644
--- a/mysql-test/r/statistics.result
+++ b/mysql-test/main/statistics.result
diff --git a/mysql-test/t/statistics.test b/mysql-test/main/statistics.test
index e9ecb56a1cb..e9ecb56a1cb 100644
--- a/mysql-test/t/statistics.test
+++ b/mysql-test/main/statistics.test
diff --git a/mysql-test/r/statistics_index_crash-7362.result b/mysql-test/main/statistics_index_crash-7362.result
index c213fa49afe..c213fa49afe 100644
--- a/mysql-test/r/statistics_index_crash-7362.result
+++ b/mysql-test/main/statistics_index_crash-7362.result
diff --git a/mysql-test/t/statistics_index_crash-7362.test b/mysql-test/main/statistics_index_crash-7362.test
index 3873b896dae..3873b896dae 100644
--- a/mysql-test/t/statistics_index_crash-7362.test
+++ b/mysql-test/main/statistics_index_crash-7362.test
diff --git a/mysql-test/t/status-master.opt b/mysql-test/main/status-master.opt
index eb3bb4fe50d..eb3bb4fe50d 100644
--- a/mysql-test/t/status-master.opt
+++ b/mysql-test/main/status-master.opt
diff --git a/mysql-test/r/status.result b/mysql-test/main/status.result
index 18cde57b295..18cde57b295 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/main/status.result
diff --git a/mysql-test/t/status.test b/mysql-test/main/status.test
index 92fba9ab0a6..92fba9ab0a6 100644
--- a/mysql-test/t/status.test
+++ b/mysql-test/main/status.test
diff --git a/mysql-test/r/status2.result b/mysql-test/main/status2.result
index 5805818fdf5..5805818fdf5 100644
--- a/mysql-test/r/status2.result
+++ b/mysql-test/main/status2.result
diff --git a/mysql-test/t/status2.test b/mysql-test/main/status2.test
index 2d1541c54f2..2d1541c54f2 100644
--- a/mysql-test/t/status2.test
+++ b/mysql-test/main/status2.test
diff --git a/mysql-test/r/status_bug17954.result b/mysql-test/main/status_bug17954.result
index 82d4d1a9a7e..82d4d1a9a7e 100644
--- a/mysql-test/r/status_bug17954.result
+++ b/mysql-test/main/status_bug17954.result
diff --git a/mysql-test/t/status_bug17954.test b/mysql-test/main/status_bug17954.test
index 36430cceeff..36430cceeff 100644
--- a/mysql-test/t/status_bug17954.test
+++ b/mysql-test/main/status_bug17954.test
diff --git a/mysql-test/r/str_to_datetime_457.result b/mysql-test/main/str_to_datetime_457.result
index 4fd0d00691c..4fd0d00691c 100644
--- a/mysql-test/r/str_to_datetime_457.result
+++ b/mysql-test/main/str_to_datetime_457.result
diff --git a/mysql-test/t/str_to_datetime_457.test b/mysql-test/main/str_to_datetime_457.test
index dd25f98ebdd..dd25f98ebdd 100644
--- a/mysql-test/t/str_to_datetime_457.test
+++ b/mysql-test/main/str_to_datetime_457.test
diff --git a/mysql-test/t/strict-master.opt b/mysql-test/main/strict-master.opt
index 96f0ce3f36c..96f0ce3f36c 100644
--- a/mysql-test/t/strict-master.opt
+++ b/mysql-test/main/strict-master.opt
diff --git a/mysql-test/r/strict.result b/mysql-test/main/strict.result
index 315bb9dc1b5..315bb9dc1b5 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/main/strict.result
diff --git a/mysql-test/t/strict.test b/mysql-test/main/strict.test
index 830f051a5f6..830f051a5f6 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/main/strict.test
diff --git a/mysql-test/r/strict_autoinc_1myisam.result b/mysql-test/main/strict_autoinc_1myisam.result
index b22540f295b..b22540f295b 100644
--- a/mysql-test/r/strict_autoinc_1myisam.result
+++ b/mysql-test/main/strict_autoinc_1myisam.result
diff --git a/mysql-test/t/strict_autoinc_1myisam.test b/mysql-test/main/strict_autoinc_1myisam.test
index d9ecce30974..d9ecce30974 100644
--- a/mysql-test/t/strict_autoinc_1myisam.test
+++ b/mysql-test/main/strict_autoinc_1myisam.test
diff --git a/mysql-test/r/strict_autoinc_2innodb.result b/mysql-test/main/strict_autoinc_2innodb.result
index 1cf720da12a..1cf720da12a 100644
--- a/mysql-test/r/strict_autoinc_2innodb.result
+++ b/mysql-test/main/strict_autoinc_2innodb.result
diff --git a/mysql-test/t/strict_autoinc_2innodb.test b/mysql-test/main/strict_autoinc_2innodb.test
index 83dfe950938..83dfe950938 100644
--- a/mysql-test/t/strict_autoinc_2innodb.test
+++ b/mysql-test/main/strict_autoinc_2innodb.test
diff --git a/mysql-test/r/strict_autoinc_3heap.result b/mysql-test/main/strict_autoinc_3heap.result
index 21eea537af5..21eea537af5 100644
--- a/mysql-test/r/strict_autoinc_3heap.result
+++ b/mysql-test/main/strict_autoinc_3heap.result
diff --git a/mysql-test/t/strict_autoinc_3heap.test b/mysql-test/main/strict_autoinc_3heap.test
index f266ecdfda2..f266ecdfda2 100644
--- a/mysql-test/t/strict_autoinc_3heap.test
+++ b/mysql-test/main/strict_autoinc_3heap.test
diff --git a/mysql-test/r/subselect.result b/mysql-test/main/subselect.result
index 1c087a3199c..1c087a3199c 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/main/subselect.result
diff --git a/mysql-test/t/subselect.test b/mysql-test/main/subselect.test
index c5cec99cebf..c5cec99cebf 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/main/subselect.test
diff --git a/mysql-test/r/subselect2.result b/mysql-test/main/subselect2.result
index 31e7774734e..31e7774734e 100644
--- a/mysql-test/r/subselect2.result
+++ b/mysql-test/main/subselect2.result
diff --git a/mysql-test/t/subselect2.test b/mysql-test/main/subselect2.test
index c106d40b095..c106d40b095 100644
--- a/mysql-test/t/subselect2.test
+++ b/mysql-test/main/subselect2.test
diff --git a/mysql-test/r/subselect3.result b/mysql-test/main/subselect3.result
index ca151daf146..ca151daf146 100644
--- a/mysql-test/r/subselect3.result
+++ b/mysql-test/main/subselect3.result
diff --git a/mysql-test/t/subselect3.test b/mysql-test/main/subselect3.test
index 0221315eb35..0221315eb35 100644
--- a/mysql-test/t/subselect3.test
+++ b/mysql-test/main/subselect3.test
diff --git a/mysql-test/r/subselect3_jcl6.result b/mysql-test/main/subselect3_jcl6.result
index adb3ec80394..adb3ec80394 100644
--- a/mysql-test/r/subselect3_jcl6.result
+++ b/mysql-test/main/subselect3_jcl6.result
diff --git a/mysql-test/t/subselect3_jcl6.test b/mysql-test/main/subselect3_jcl6.test
index e4b1c144b93..6cbbf10cc2f 100644
--- a/mysql-test/t/subselect3_jcl6.test
+++ b/mysql-test/main/subselect3_jcl6.test
@@ -13,7 +13,7 @@ show variables like 'join_cache_level';
 
 set @join_cache_level_for_subselect3_test=@@join_cache_level;
 
---source t/subselect3.test
+--source subselect3.test
 
 set join_cache_level=default;
 show variables like 'join_cache_level';
diff --git a/mysql-test/r/subselect4.result b/mysql-test/main/subselect4.result
index 25290650e9b..25290650e9b 100644
--- a/mysql-test/r/subselect4.result
+++ b/mysql-test/main/subselect4.result
diff --git a/mysql-test/t/subselect4.test b/mysql-test/main/subselect4.test
index 77ea117b15f..77ea117b15f 100644
--- a/mysql-test/t/subselect4.test
+++ b/mysql-test/main/subselect4.test
diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/main/subselect_cache.result
index 813d668c88c..813d668c88c 100644
--- a/mysql-test/r/subselect_cache.result
+++ b/mysql-test/main/subselect_cache.result
diff --git a/mysql-test/t/subselect_cache.test b/mysql-test/main/subselect_cache.test
index 55da0000f13..55da0000f13 100644
--- a/mysql-test/t/subselect_cache.test
+++ b/mysql-test/main/subselect_cache.test
diff --git a/mysql-test/r/subselect_debug.result b/mysql-test/main/subselect_debug.result
index 9be53ae0473..9be53ae0473 100644
--- a/mysql-test/r/subselect_debug.result
+++ b/mysql-test/main/subselect_debug.result
diff --git a/mysql-test/t/subselect_debug.test b/mysql-test/main/subselect_debug.test
index f27867dc9d0..f27867dc9d0 100644
--- a/mysql-test/t/subselect_debug.test
+++ b/mysql-test/main/subselect_debug.test
diff --git a/mysql-test/r/subselect_exists2in.result b/mysql-test/main/subselect_exists2in.result
index 95fc1c19b82..95fc1c19b82 100644
--- a/mysql-test/r/subselect_exists2in.result
+++ b/mysql-test/main/subselect_exists2in.result
diff --git a/mysql-test/t/subselect_exists2in.test b/mysql-test/main/subselect_exists2in.test
index 5a8ddb3612f..5a8ddb3612f 100644
--- a/mysql-test/t/subselect_exists2in.test
+++ b/mysql-test/main/subselect_exists2in.test
diff --git a/mysql-test/r/subselect_exists2in_costmat.result b/mysql-test/main/subselect_exists2in_costmat.result
index a46996d9bad..a46996d9bad 100644
--- a/mysql-test/r/subselect_exists2in_costmat.result
+++ b/mysql-test/main/subselect_exists2in_costmat.result
diff --git a/mysql-test/t/subselect_exists2in_costmat.test b/mysql-test/main/subselect_exists2in_costmat.test
index 5d5eeaee268..5d5eeaee268 100644
--- a/mysql-test/t/subselect_exists2in_costmat.test
+++ b/mysql-test/main/subselect_exists2in_costmat.test
diff --git a/mysql-test/r/subselect_extra.result b/mysql-test/main/subselect_extra.result
index 73642c09324..73642c09324 100644
--- a/mysql-test/r/subselect_extra.result
+++ b/mysql-test/main/subselect_extra.result
diff --git a/mysql-test/t/subselect_extra.test b/mysql-test/main/subselect_extra.test
index b76f3f70516..b76f3f70516 100644
--- a/mysql-test/t/subselect_extra.test
+++ b/mysql-test/main/subselect_extra.test
diff --git a/mysql-test/r/subselect_extra_no_semijoin.result b/mysql-test/main/subselect_extra_no_semijoin.result
index fc8d5759945..fc8d5759945 100644
--- a/mysql-test/r/subselect_extra_no_semijoin.result
+++ b/mysql-test/main/subselect_extra_no_semijoin.result
diff --git a/mysql-test/t/subselect_extra_no_semijoin.test b/mysql-test/main/subselect_extra_no_semijoin.test
index 8aba3dde72b..4340f4165e7 100644
--- a/mysql-test/t/subselect_extra_no_semijoin.test
+++ b/mysql-test/main/subselect_extra_no_semijoin.test
@@ -2,7 +2,7 @@ set @subselect_extra_no_sj_tmp=@@optimizer_switch;
 
 set  @optimizer_switch_for_subselect_extra_test='semijoin=off,firstmatch=off,loosescan=off,semijoin_with_cache=off';
 
---source t/subselect_extra.test
+--source subselect_extra.test
 
 set optimizer_switch= @subselect_extra_no_sj_tmp;
 
diff --git a/mysql-test/r/subselect_gis.result b/mysql-test/main/subselect_gis.result
index 34ab7748656..34ab7748656 100644
--- a/mysql-test/r/subselect_gis.result
+++ b/mysql-test/main/subselect_gis.result
diff --git a/mysql-test/t/subselect_gis.test b/mysql-test/main/subselect_gis.test
index 1ab139b7822..1ab139b7822 100644
--- a/mysql-test/t/subselect_gis.test
+++ b/mysql-test/main/subselect_gis.test
diff --git a/mysql-test/r/subselect_innodb.result b/mysql-test/main/subselect_innodb.result
index ec7f2c0a3d5..ec7f2c0a3d5 100644
--- a/mysql-test/r/subselect_innodb.result
+++ b/mysql-test/main/subselect_innodb.result
diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/main/subselect_innodb.test
index 544bcd994ed..544bcd994ed 100644
--- a/mysql-test/t/subselect_innodb.test
+++ b/mysql-test/main/subselect_innodb.test
diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/main/subselect_mat.result
index 4d425d0fe5c..4d425d0fe5c 100644
--- a/mysql-test/r/subselect_mat.result
+++ b/mysql-test/main/subselect_mat.result
diff --git a/mysql-test/t/subselect_mat.test b/mysql-test/main/subselect_mat.test
index bf5de741ea0..7055b323906 100644
--- a/mysql-test/t/subselect_mat.test
+++ b/mysql-test/main/subselect_mat.test
@@ -7,7 +7,7 @@
 # force the use of materialization
 set @subselect_mat_test_optimizer_switch_value='materialization=on,in_to_exists=off,semijoin=off';
 
---source t/subselect_sj_mat.test
+--source subselect_sj_mat.test
 set @subselect_mat_test_optimizer_switch_value=null;
 
 set @@optimizer_switch='materialization=on,in_to_exists=off,semijoin=off';
diff --git a/mysql-test/t/subselect_mat_cost-master.opt b/mysql-test/main/subselect_mat_cost-master.opt
index cb4a9db9617..cb4a9db9617 100644
--- a/mysql-test/t/subselect_mat_cost-master.opt
+++ b/mysql-test/main/subselect_mat_cost-master.opt
diff --git a/mysql-test/r/subselect_mat_cost.result b/mysql-test/main/subselect_mat_cost.result
index a9f980fff5d..a9f980fff5d 100644
--- a/mysql-test/r/subselect_mat_cost.result
+++ b/mysql-test/main/subselect_mat_cost.result
diff --git a/mysql-test/t/subselect_mat_cost.test b/mysql-test/main/subselect_mat_cost.test
index 5a1fb550ca4..5a1fb550ca4 100644
--- a/mysql-test/t/subselect_mat_cost.test
+++ b/mysql-test/main/subselect_mat_cost.test
diff --git a/mysql-test/r/subselect_mat_cost_bugs.result b/mysql-test/main/subselect_mat_cost_bugs.result
index 125da8da517..125da8da517 100644
--- a/mysql-test/r/subselect_mat_cost_bugs.result
+++ b/mysql-test/main/subselect_mat_cost_bugs.result
diff --git a/mysql-test/t/subselect_mat_cost_bugs.test b/mysql-test/main/subselect_mat_cost_bugs.test
index 67af6e3a54a..67af6e3a54a 100644
--- a/mysql-test/t/subselect_mat_cost_bugs.test
+++ b/mysql-test/main/subselect_mat_cost_bugs.test
diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/main/subselect_no_exists_to_in.result
index eb912d9e331..eb912d9e331 100644
--- a/mysql-test/r/subselect_no_exists_to_in.result
+++ b/mysql-test/main/subselect_no_exists_to_in.result
diff --git a/mysql-test/t/subselect_no_exists_to_in.test b/mysql-test/main/subselect_no_exists_to_in.test
index 7145a4594bc..4f39cfbdf66 100644
--- a/mysql-test/t/subselect_no_exists_to_in.test
+++ b/mysql-test/main/subselect_no_exists_to_in.test
@@ -4,7 +4,7 @@
 select @@optimizer_switch like '%exists_to_in=off%';
 set optimizer_switch='exists_to_in=off';
 
---source t/subselect.test
+--source subselect.test
 
 set optimizer_switch=default;
 select @@optimizer_switch like '%exists_to_in=off%';
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/main/subselect_no_mat.result
index 72f30bbd21f..72f30bbd21f 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/main/subselect_no_mat.result
diff --git a/mysql-test/t/subselect_no_mat.test b/mysql-test/main/subselect_no_mat.test
index ccd93af64ce..173dd104968 100644
--- a/mysql-test/t/subselect_no_mat.test
+++ b/mysql-test/main/subselect_no_mat.test
@@ -8,7 +8,7 @@ set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
 set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 
---source t/subselect.test
+--source subselect.test
 
 set optimizer_switch=default;
 select @@optimizer_switch like '%materialization=on%';
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/main/subselect_no_opts.result
index de075d3245f..de075d3245f 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/main/subselect_no_opts.result
diff --git a/mysql-test/t/subselect_no_opts.test b/mysql-test/main/subselect_no_opts.test
index 8a699fefaf7..ddc0dc6c6b9 100644
--- a/mysql-test/t/subselect_no_opts.test
+++ b/mysql-test/main/subselect_no_opts.test
@@ -8,7 +8,7 @@ set @optimizer_switch_for_subselect_test='materialization=off,semijoin=off,subqu
 set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 
---source t/subselect.test
+--source subselect.test
 
 set @optimizer_switch_for_subselect_test=null; 
 
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/main/subselect_no_scache.result
index a594f5f85b9..a594f5f85b9 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/main/subselect_no_scache.result
diff --git a/mysql-test/t/subselect_no_scache.test b/mysql-test/main/subselect_no_scache.test
index a8ff559b82b..7faf9c111ce 100644
--- a/mysql-test/t/subselect_no_scache.test
+++ b/mysql-test/main/subselect_no_scache.test
@@ -7,7 +7,7 @@ set optimizer_switch='subquery_cache=off';
 set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 
---source t/subselect.test
+--source subselect.test
 
 set optimizer_switch=default;
 select @@optimizer_switch like '%subquery_cache=on%';
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/main/subselect_no_semijoin.result
index e068b28b017..e068b28b017 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/main/subselect_no_semijoin.result
diff --git a/mysql-test/t/subselect_no_semijoin.test b/mysql-test/main/subselect_no_semijoin.test
index 46791667173..6b82b748912 100644
--- a/mysql-test/t/subselect_no_semijoin.test
+++ b/mysql-test/main/subselect_no_semijoin.test
@@ -6,7 +6,7 @@ set @optimizer_switch_for_subselect_test='semijoin=off,mrr=on,mrr_sort_keys=on,i
 set join_cache_level=1;
 set @join_cache_level_for_subselect_test=@@join_cache_level;
 
---source t/subselect.test
+--source subselect.test
 
 set @optimizer_switch_for_subselect_test=null; 
 set @join_cache_level_for_subselect_test=NULL;
diff --git a/mysql-test/r/subselect_notembedded.result b/mysql-test/main/subselect_notembedded.result
index 9153706fc27..9153706fc27 100644
--- a/mysql-test/r/subselect_notembedded.result
+++ b/mysql-test/main/subselect_notembedded.result
diff --git a/mysql-test/t/subselect_notembedded.test b/mysql-test/main/subselect_notembedded.test
index dcda71c767f..dcda71c767f 100644
--- a/mysql-test/t/subselect_notembedded.test
+++ b/mysql-test/main/subselect_notembedded.test
diff --git a/mysql-test/r/subselect_nulls.result b/mysql-test/main/subselect_nulls.result
index 08982371269..08982371269 100644
--- a/mysql-test/r/subselect_nulls.result
+++ b/mysql-test/main/subselect_nulls.result
diff --git a/mysql-test/t/subselect_nulls.test b/mysql-test/main/subselect_nulls.test
index 3e7b2189ed5..3e7b2189ed5 100644
--- a/mysql-test/t/subselect_nulls.test
+++ b/mysql-test/main/subselect_nulls.test
diff --git a/mysql-test/r/subselect_partial_match.result b/mysql-test/main/subselect_partial_match.result
index 5f444457794..5f444457794 100644
--- a/mysql-test/r/subselect_partial_match.result
+++ b/mysql-test/main/subselect_partial_match.result
diff --git a/mysql-test/t/subselect_partial_match.test b/mysql-test/main/subselect_partial_match.test
index fd1e6de716c..fd1e6de716c 100644
--- a/mysql-test/t/subselect_partial_match.test
+++ b/mysql-test/main/subselect_partial_match.test
diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/main/subselect_sj.result
index 9631192da33..9631192da33 100644
--- a/mysql-test/r/subselect_sj.result
+++ b/mysql-test/main/subselect_sj.result
diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/main/subselect_sj.test
index 6fdccee339d..6fdccee339d 100644
--- a/mysql-test/t/subselect_sj.test
+++ b/mysql-test/main/subselect_sj.test
diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/main/subselect_sj2.result
index 948be5766a2..948be5766a2 100644
--- a/mysql-test/r/subselect_sj2.result
+++ b/mysql-test/main/subselect_sj2.result
diff --git a/mysql-test/t/subselect_sj2.test b/mysql-test/main/subselect_sj2.test
index a948b086a85..a948b086a85 100644
--- a/mysql-test/t/subselect_sj2.test
+++ b/mysql-test/main/subselect_sj2.test
diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/main/subselect_sj2_jcl6.result
index 2955307eb86..2955307eb86 100644
--- a/mysql-test/r/subselect_sj2_jcl6.result
+++ b/mysql-test/main/subselect_sj2_jcl6.result
diff --git a/mysql-test/t/subselect_sj2_jcl6.test b/mysql-test/main/subselect_sj2_jcl6.test
index fbc474f7067..7ff08716230 100644
--- a/mysql-test/t/subselect_sj2_jcl6.test
+++ b/mysql-test/main/subselect_sj2_jcl6.test
@@ -14,7 +14,7 @@ show variables like 'join_cache_level';
 set @optimizer_switch_for_subselect_sj2_test=@@optimizer_switch;
 set @join_cache_level_for_subselect_sj2_test=@@join_cache_level;
 
---source t/subselect_sj2.test
+--source subselect_sj2.test
 
 --echo #
 --echo # Bug #898073: potential incremental join cache for semijoin
diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/main/subselect_sj2_mat.result
index 6a1f310511f..6a1f310511f 100644
--- a/mysql-test/r/subselect_sj2_mat.result
+++ b/mysql-test/main/subselect_sj2_mat.result
diff --git a/mysql-test/t/subselect_sj2_mat.test b/mysql-test/main/subselect_sj2_mat.test
index cfb6c8c2819..0234f0cb7b6 100644
--- a/mysql-test/t/subselect_sj2_mat.test
+++ b/mysql-test/main/subselect_sj2_mat.test
@@ -4,7 +4,7 @@
 set optimizer_switch='materialization=on';
 set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
 
---source t/subselect_sj2.test
+--source subselect_sj2.test
 
 set optimizer_switch=default;
 select @@optimizer_switch like '%materialization=on%';
diff --git a/mysql-test/r/subselect_sj_aria.result b/mysql-test/main/subselect_sj_aria.result
index ea6cc8d14c4..ea6cc8d14c4 100644
--- a/mysql-test/r/subselect_sj_aria.result
+++ b/mysql-test/main/subselect_sj_aria.result
diff --git a/mysql-test/t/subselect_sj_aria.test b/mysql-test/main/subselect_sj_aria.test
index 806688b3f87..806688b3f87 100644
--- a/mysql-test/t/subselect_sj_aria.test
+++ b/mysql-test/main/subselect_sj_aria.test
diff --git a/mysql-test/r/subselect_sj_jcl6.result b/mysql-test/main/subselect_sj_jcl6.result
index 77a073ea2d3..77a073ea2d3 100644
--- a/mysql-test/r/subselect_sj_jcl6.result
+++ b/mysql-test/main/subselect_sj_jcl6.result
diff --git a/mysql-test/t/subselect_sj_jcl6.test b/mysql-test/main/subselect_sj_jcl6.test
index e86ed017951..ad4a78bdaa5 100644
--- a/mysql-test/t/subselect_sj_jcl6.test
+++ b/mysql-test/main/subselect_sj_jcl6.test
@@ -16,7 +16,7 @@ show variables like 'join_cache_level';
 set @optimizer_switch_for_subselect_sj_test=@@optimizer_switch;
 set @join_cache_level_for_subselect_sj_test=@@join_cache_level;
 
---source t/subselect_sj.test
+--source subselect_sj.test
 
 --echo #
 --echo # BUG#49129: Wrong result with IN-subquery with join_cache_level=6 and firstmatch=off
diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result
index 9e1870875ce..9e1870875ce 100644
--- a/mysql-test/r/subselect_sj_mat.result
+++ b/mysql-test/main/subselect_sj_mat.result
diff --git a/mysql-test/t/subselect_sj_mat.test b/mysql-test/main/subselect_sj_mat.test
index bfd3b28a5b2..bfd3b28a5b2 100644
--- a/mysql-test/t/subselect_sj_mat.test
+++ b/mysql-test/main/subselect_sj_mat.test
diff --git a/mysql-test/r/subselect_sj_nonmerged.result b/mysql-test/main/subselect_sj_nonmerged.result
index c7e04225ffe..c7e04225ffe 100644
--- a/mysql-test/r/subselect_sj_nonmerged.result
+++ b/mysql-test/main/subselect_sj_nonmerged.result
diff --git a/mysql-test/t/subselect_sj_nonmerged.test b/mysql-test/main/subselect_sj_nonmerged.test
index e47e72ffe97..e47e72ffe97 100644
--- a/mysql-test/t/subselect_sj_nonmerged.test
+++ b/mysql-test/main/subselect_sj_nonmerged.test
diff --git a/mysql-test/r/sum_distinct-big.result b/mysql-test/main/sum_distinct-big.result
index 2d350826ac8..2d350826ac8 100644
--- a/mysql-test/r/sum_distinct-big.result
+++ b/mysql-test/main/sum_distinct-big.result
diff --git a/mysql-test/t/sum_distinct-big.test b/mysql-test/main/sum_distinct-big.test
index fee406ee46d..fee406ee46d 100644
--- a/mysql-test/t/sum_distinct-big.test
+++ b/mysql-test/main/sum_distinct-big.test
diff --git a/mysql-test/r/sum_distinct.result b/mysql-test/main/sum_distinct.result
index 2746f5a09f4..2746f5a09f4 100644
--- a/mysql-test/r/sum_distinct.result
+++ b/mysql-test/main/sum_distinct.result
diff --git a/mysql-test/t/sum_distinct.test b/mysql-test/main/sum_distinct.test
index 633a72fddc8..633a72fddc8 100644
--- a/mysql-test/t/sum_distinct.test
+++ b/mysql-test/main/sum_distinct.test
diff --git a/mysql-test/r/symlink-aria-11902.result b/mysql-test/main/symlink-aria-11902.result
index 4d8f179dac9..4d8f179dac9 100644
--- a/mysql-test/r/symlink-aria-11902.result
+++ b/mysql-test/main/symlink-aria-11902.result
diff --git a/mysql-test/t/symlink-aria-11902.test b/mysql-test/main/symlink-aria-11902.test
index a2a266cbb25..a2a266cbb25 100644
--- a/mysql-test/t/symlink-aria-11902.test
+++ b/mysql-test/main/symlink-aria-11902.test
diff --git a/mysql-test/r/symlink-myisam-11902.result b/mysql-test/main/symlink-myisam-11902.result
index bc9a0316bab..bc9a0316bab 100644
--- a/mysql-test/r/symlink-myisam-11902.result
+++ b/mysql-test/main/symlink-myisam-11902.result
diff --git a/mysql-test/t/symlink-myisam-11902.test b/mysql-test/main/symlink-myisam-11902.test
index 8fd4961d1fb..8fd4961d1fb 100644
--- a/mysql-test/t/symlink-myisam-11902.test
+++ b/mysql-test/main/symlink-myisam-11902.test
diff --git a/mysql-test/r/symlink.result b/mysql-test/main/symlink.result
index e8063ee736c..e8063ee736c 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/main/symlink.result
diff --git a/mysql-test/t/symlink.test b/mysql-test/main/symlink.test
index cf95d4cb938..cf95d4cb938 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/main/symlink.test
diff --git a/mysql-test/r/synchronization.result b/mysql-test/main/synchronization.result
index ee8195820b0..ee8195820b0 100644
--- a/mysql-test/r/synchronization.result
+++ b/mysql-test/main/synchronization.result
diff --git a/mysql-test/t/synchronization.test b/mysql-test/main/synchronization.test
index aef06245717..aef06245717 100644
--- a/mysql-test/t/synchronization.test
+++ b/mysql-test/main/synchronization.test
diff --git a/mysql-test/t/sysdate_is_now-master.opt b/mysql-test/main/sysdate_is_now-master.opt
index 97a58d28032..97a58d28032 100644
--- a/mysql-test/t/sysdate_is_now-master.opt
+++ b/mysql-test/main/sysdate_is_now-master.opt
diff --git a/mysql-test/r/sysdate_is_now.result b/mysql-test/main/sysdate_is_now.result
index 82861436ff6..82861436ff6 100644
--- a/mysql-test/r/sysdate_is_now.result
+++ b/mysql-test/main/sysdate_is_now.result
diff --git a/mysql-test/t/sysdate_is_now.test b/mysql-test/main/sysdate_is_now.test
index 166914e20c8..166914e20c8 100644
--- a/mysql-test/t/sysdate_is_now.test
+++ b/mysql-test/main/sysdate_is_now.test
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/main/system_mysql_db.result
index 2abcfb92ffa..2abcfb92ffa 100644
--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/main/system_mysql_db.result
diff --git a/mysql-test/t/system_mysql_db.test b/mysql-test/main/system_mysql_db.test
index 398a222b642..398a222b642 100644
--- a/mysql-test/t/system_mysql_db.test
+++ b/mysql-test/main/system_mysql_db.test
diff --git a/mysql-test/r/system_mysql_db_fix40123.result b/mysql-test/main/system_mysql_db_fix40123.result
index 2abcfb92ffa..2abcfb92ffa 100644
--- a/mysql-test/r/system_mysql_db_fix40123.result
+++ b/mysql-test/main/system_mysql_db_fix40123.result
diff --git a/mysql-test/t/system_mysql_db_fix40123.test b/mysql-test/main/system_mysql_db_fix40123.test
index 2d17a0964e5..2d17a0964e5 100644
--- a/mysql-test/t/system_mysql_db_fix40123.test
+++ b/mysql-test/main/system_mysql_db_fix40123.test
diff --git a/mysql-test/r/system_mysql_db_fix50030.result b/mysql-test/main/system_mysql_db_fix50030.result
index 81b6da4c16d..81b6da4c16d 100644
--- a/mysql-test/r/system_mysql_db_fix50030.result
+++ b/mysql-test/main/system_mysql_db_fix50030.result
diff --git a/mysql-test/t/system_mysql_db_fix50030.test b/mysql-test/main/system_mysql_db_fix50030.test
index 9506c3465e7..9506c3465e7 100644
--- a/mysql-test/t/system_mysql_db_fix50030.test
+++ b/mysql-test/main/system_mysql_db_fix50030.test
diff --git a/mysql-test/r/system_mysql_db_fix50117.result b/mysql-test/main/system_mysql_db_fix50117.result
index 2abcfb92ffa..2abcfb92ffa 100644
--- a/mysql-test/r/system_mysql_db_fix50117.result
+++ b/mysql-test/main/system_mysql_db_fix50117.result
diff --git a/mysql-test/t/system_mysql_db_fix50117.test b/mysql-test/main/system_mysql_db_fix50117.test
index f8bef3da162..f8bef3da162 100644
--- a/mysql-test/t/system_mysql_db_fix50117.test
+++ b/mysql-test/main/system_mysql_db_fix50117.test
diff --git a/mysql-test/r/system_mysql_db_refs.result b/mysql-test/main/system_mysql_db_refs.result
index 96ecd2f27c0..96ecd2f27c0 100644
--- a/mysql-test/r/system_mysql_db_refs.result
+++ b/mysql-test/main/system_mysql_db_refs.result
diff --git a/mysql-test/t/system_mysql_db_refs.test b/mysql-test/main/system_mysql_db_refs.test
index 63f30e7db63..63f30e7db63 100644
--- a/mysql-test/t/system_mysql_db_refs.test
+++ b/mysql-test/main/system_mysql_db_refs.test
diff --git a/mysql-test/r/table_elim.result b/mysql-test/main/table_elim.result
index cf9a4a38779..cf9a4a38779 100644
--- a/mysql-test/r/table_elim.result
+++ b/mysql-test/main/table_elim.result
diff --git a/mysql-test/t/table_elim.test b/mysql-test/main/table_elim.test
index 8de4743b9fd..8de4743b9fd 100644
--- a/mysql-test/t/table_elim.test
+++ b/mysql-test/main/table_elim.test
diff --git a/mysql-test/r/table_elim_debug.result b/mysql-test/main/table_elim_debug.result
index ae49b1433fd..ae49b1433fd 100644
--- a/mysql-test/r/table_elim_debug.result
+++ b/mysql-test/main/table_elim_debug.result
diff --git a/mysql-test/t/table_elim_debug.test b/mysql-test/main/table_elim_debug.test
index 6400f798195..6400f798195 100644
--- a/mysql-test/t/table_elim_debug.test
+++ b/mysql-test/main/table_elim_debug.test
diff --git a/mysql-test/r/table_keyinfo-6838.result b/mysql-test/main/table_keyinfo-6838.result
index 55b035069ce..55b035069ce 100644
--- a/mysql-test/r/table_keyinfo-6838.result
+++ b/mysql-test/main/table_keyinfo-6838.result
diff --git a/mysql-test/t/table_keyinfo-6838.test b/mysql-test/main/table_keyinfo-6838.test
index 5f4c9f44f86..5f4c9f44f86 100644
--- a/mysql-test/t/table_keyinfo-6838.test
+++ b/mysql-test/main/table_keyinfo-6838.test
diff --git a/mysql-test/r/table_options-5867.result b/mysql-test/main/table_options-5867.result
index f915c2740ae..f915c2740ae 100644
--- a/mysql-test/r/table_options-5867.result
+++ b/mysql-test/main/table_options-5867.result
diff --git a/mysql-test/t/table_options-5867.test b/mysql-test/main/table_options-5867.test
index 153ec08e675..153ec08e675 100644
--- a/mysql-test/t/table_options-5867.test
+++ b/mysql-test/main/table_options-5867.test
diff --git a/mysql-test/r/table_options.result b/mysql-test/main/table_options.result
index 164fe4e30d0..164fe4e30d0 100644
--- a/mysql-test/r/table_options.result
+++ b/mysql-test/main/table_options.result
diff --git a/mysql-test/t/table_options.test b/mysql-test/main/table_options.test
index 533e6829c00..533e6829c00 100644
--- a/mysql-test/t/table_options.test
+++ b/mysql-test/main/table_options.test
diff --git a/mysql-test/r/table_value_constr.result b/mysql-test/main/table_value_constr.result
index 39caba331ef..39caba331ef 100644
--- a/mysql-test/r/table_value_constr.result
+++ b/mysql-test/main/table_value_constr.result
diff --git a/mysql-test/t/table_value_constr.test b/mysql-test/main/table_value_constr.test
index 578f8943fbb..578f8943fbb 100644
--- a/mysql-test/t/table_value_constr.test
+++ b/mysql-test/main/table_value_constr.test
diff --git a/mysql-test/r/tablelock.result b/mysql-test/main/tablelock.result
index 6923ad40916..6923ad40916 100644
--- a/mysql-test/r/tablelock.result
+++ b/mysql-test/main/tablelock.result
diff --git a/mysql-test/t/tablelock.test b/mysql-test/main/tablelock.test
index 5ac93f09ac1..5ac93f09ac1 100644
--- a/mysql-test/t/tablelock.test
+++ b/mysql-test/main/tablelock.test
diff --git a/mysql-test/r/tablespace.result b/mysql-test/main/tablespace.result
index 38d450ae430..38d450ae430 100644
--- a/mysql-test/r/tablespace.result
+++ b/mysql-test/main/tablespace.result
diff --git a/mysql-test/t/tablespace.test b/mysql-test/main/tablespace.test
index 9f3cf6255ac..9f3cf6255ac 100644
--- a/mysql-test/t/tablespace.test
+++ b/mysql-test/main/tablespace.test
diff --git a/mysql-test/r/tc_heuristic_recover.result b/mysql-test/main/tc_heuristic_recover.result
index 193a73c77f8..193a73c77f8 100644
--- a/mysql-test/r/tc_heuristic_recover.result
+++ b/mysql-test/main/tc_heuristic_recover.result
diff --git a/mysql-test/t/tc_heuristic_recover.test b/mysql-test/main/tc_heuristic_recover.test
index 8cbf7d61143..8cbf7d61143 100644
--- a/mysql-test/t/tc_heuristic_recover.test
+++ b/mysql-test/main/tc_heuristic_recover.test
diff --git a/mysql-test/t/temp_table-master.opt b/mysql-test/main/temp_table-master.opt
index 5ac2ca8495b..5ac2ca8495b 100644
--- a/mysql-test/t/temp_table-master.opt
+++ b/mysql-test/main/temp_table-master.opt
diff --git a/mysql-test/r/temp_table.result b/mysql-test/main/temp_table.result
index d1bec4a2af5..d1bec4a2af5 100644
--- a/mysql-test/r/temp_table.result
+++ b/mysql-test/main/temp_table.result
diff --git a/mysql-test/t/temp_table.test b/mysql-test/main/temp_table.test
index fb44362b537..fb44362b537 100644
--- a/mysql-test/t/temp_table.test
+++ b/mysql-test/main/temp_table.test
diff --git a/mysql-test/r/temp_table_frm.result b/mysql-test/main/temp_table_frm.result
index 19c66380af2..19c66380af2 100644
--- a/mysql-test/r/temp_table_frm.result
+++ b/mysql-test/main/temp_table_frm.result
diff --git a/mysql-test/t/temp_table_frm.test b/mysql-test/main/temp_table_frm.test
index 178bd15004b..178bd15004b 100644
--- a/mysql-test/t/temp_table_frm.test
+++ b/mysql-test/main/temp_table_frm.test
diff --git a/mysql-test/r/temporal_literal.result b/mysql-test/main/temporal_literal.result
index f4f43fe9ba3..f4f43fe9ba3 100644
--- a/mysql-test/r/temporal_literal.result
+++ b/mysql-test/main/temporal_literal.result
diff --git a/mysql-test/t/temporal_literal.test b/mysql-test/main/temporal_literal.test
index 6783b19a7d4..6783b19a7d4 100644
--- a/mysql-test/t/temporal_literal.test
+++ b/mysql-test/main/temporal_literal.test
diff --git a/mysql-test/r/temporal_scale_4283.result b/mysql-test/main/temporal_scale_4283.result
index 685a6192a97..685a6192a97 100644
--- a/mysql-test/r/temporal_scale_4283.result
+++ b/mysql-test/main/temporal_scale_4283.result
diff --git a/mysql-test/t/temporal_scale_4283.test b/mysql-test/main/temporal_scale_4283.test
index d79ca7caa54..d79ca7caa54 100644
--- a/mysql-test/t/temporal_scale_4283.test
+++ b/mysql-test/main/temporal_scale_4283.test
diff --git a/mysql-test/r/thread_id_overflow.result b/mysql-test/main/thread_id_overflow.result
index 8303debb246..8303debb246 100644
--- a/mysql-test/r/thread_id_overflow.result
+++ b/mysql-test/main/thread_id_overflow.result
diff --git a/mysql-test/t/thread_id_overflow.test b/mysql-test/main/thread_id_overflow.test
index e93e14f4284..e93e14f4284 100644
--- a/mysql-test/t/thread_id_overflow.test
+++ b/mysql-test/main/thread_id_overflow.test
diff --git a/mysql-test/r/timeout.result b/mysql-test/main/timeout.result
index 8d1ca137043..8d1ca137043 100644
--- a/mysql-test/r/timeout.result
+++ b/mysql-test/main/timeout.result
diff --git a/mysql-test/t/timeout.test b/mysql-test/main/timeout.test
index 9f6e692b148..9f6e692b148 100644
--- a/mysql-test/t/timeout.test
+++ b/mysql-test/main/timeout.test
diff --git a/mysql-test/t/timezone-master.opt b/mysql-test/main/timezone-master.opt
index 0477f941e9d..0477f941e9d 100644
--- a/mysql-test/t/timezone-master.opt
+++ b/mysql-test/main/timezone-master.opt
diff --git a/mysql-test/r/timezone.result b/mysql-test/main/timezone.result
index d84fe54ba8c..d84fe54ba8c 100644
--- a/mysql-test/r/timezone.result
+++ b/mysql-test/main/timezone.result
diff --git a/mysql-test/t/timezone.test b/mysql-test/main/timezone.test
index a41e806a40e..ec1d50cf0ae 100644
--- a/mysql-test/t/timezone.test
+++ b/mysql-test/main/timezone.test
@@ -2,7 +2,7 @@
 # Test of SYSTEM time zone handling ( for my_system_gmt_sec()).
 # This script must be run with TZ=MET
 
--- require r/have_met_timezone.require
+-- require include/have_met_timezone.require
 disable_query_log;
 select FROM_UNIXTIME(24*3600);
 enable_query_log;
diff --git a/mysql-test/r/timezone2.result b/mysql-test/main/timezone2.result
index 096e996bffb..096e996bffb 100644
--- a/mysql-test/r/timezone2.result
+++ b/mysql-test/main/timezone2.result
diff --git a/mysql-test/t/timezone2.test b/mysql-test/main/timezone2.test
index 7a38610ad95..7a38610ad95 100644
--- a/mysql-test/t/timezone2.test
+++ b/mysql-test/main/timezone2.test
diff --git a/mysql-test/t/timezone3-master.opt b/mysql-test/main/timezone3-master.opt
index 6910e6e6e8d..6910e6e6e8d 100644
--- a/mysql-test/t/timezone3-master.opt
+++ b/mysql-test/main/timezone3-master.opt
diff --git a/mysql-test/r/timezone3.result b/mysql-test/main/timezone3.result
index ceac4a5aefb..ceac4a5aefb 100644
--- a/mysql-test/r/timezone3.result
+++ b/mysql-test/main/timezone3.result
diff --git a/mysql-test/t/timezone3.test b/mysql-test/main/timezone3.test
index 8a9941f6383..fc4be0f009e 100644
--- a/mysql-test/t/timezone3.test
+++ b/mysql-test/main/timezone3.test
@@ -6,7 +6,7 @@
 # characters after colon in TZ variable as path to zoneinfo file.
 #
 # Check that we have successfully set time zone with leap seconds.
---require r/have_moscow_leap_timezone.require
+--require include/have_moscow_leap_timezone.require
 disable_query_log;
 select from_unixtime(1072904422);
 enable_query_log;
diff --git a/mysql-test/t/timezone4-master.opt b/mysql-test/main/timezone4-master.opt
index d1ab6207933..d1ab6207933 100644
--- a/mysql-test/t/timezone4-master.opt
+++ b/mysql-test/main/timezone4-master.opt
diff --git a/mysql-test/r/timezone4.result b/mysql-test/main/timezone4.result
index 28028bea657..28028bea657 100644
--- a/mysql-test/r/timezone4.result
+++ b/mysql-test/main/timezone4.result
diff --git a/mysql-test/t/timezone4.test b/mysql-test/main/timezone4.test
index d7372c75d5a..d7372c75d5a 100644
--- a/mysql-test/t/timezone4.test
+++ b/mysql-test/main/timezone4.test
diff --git a/mysql-test/r/timezone_grant.result b/mysql-test/main/timezone_grant.result
index 42ce458d00f..42ce458d00f 100644
--- a/mysql-test/r/timezone_grant.result
+++ b/mysql-test/main/timezone_grant.result
diff --git a/mysql-test/t/timezone_grant.test b/mysql-test/main/timezone_grant.test
index a6dd6be695e..a6dd6be695e 100644
--- a/mysql-test/t/timezone_grant.test
+++ b/mysql-test/main/timezone_grant.test
diff --git a/mysql-test/r/tmp_table_count-7586.result b/mysql-test/main/tmp_table_count-7586.result
index 0c526e0d4a3..0c526e0d4a3 100644
--- a/mysql-test/r/tmp_table_count-7586.result
+++ b/mysql-test/main/tmp_table_count-7586.result
diff --git a/mysql-test/t/tmp_table_count-7586.test b/mysql-test/main/tmp_table_count-7586.test
index e7bac127815..e7bac127815 100644
--- a/mysql-test/t/tmp_table_count-7586.test
+++ b/mysql-test/main/tmp_table_count-7586.test
diff --git a/mysql-test/t/trans_read_only-master.opt b/mysql-test/main/trans_read_only-master.opt
index cf84816ec90..cf84816ec90 100644
--- a/mysql-test/t/trans_read_only-master.opt
+++ b/mysql-test/main/trans_read_only-master.opt
diff --git a/mysql-test/r/trans_read_only.result b/mysql-test/main/trans_read_only.result
index 5e86b0993cd..5e86b0993cd 100644
--- a/mysql-test/r/trans_read_only.result
+++ b/mysql-test/main/trans_read_only.result
diff --git a/mysql-test/t/trans_read_only.test b/mysql-test/main/trans_read_only.test
index 38b2a833216..38b2a833216 100644
--- a/mysql-test/t/trans_read_only.test
+++ b/mysql-test/main/trans_read_only.test
diff --git a/mysql-test/r/transaction_timeout.result b/mysql-test/main/transaction_timeout.result
index 95237cf6940..95237cf6940 100644
--- a/mysql-test/r/transaction_timeout.result
+++ b/mysql-test/main/transaction_timeout.result
diff --git a/mysql-test/t/transaction_timeout.test b/mysql-test/main/transaction_timeout.test
index f2a044497c5..f2a044497c5 100644
--- a/mysql-test/t/transaction_timeout.test
+++ b/mysql-test/main/transaction_timeout.test
diff --git a/mysql-test/r/trigger-compat.result b/mysql-test/main/trigger-compat.result
index 387d4fb1489..387d4fb1489 100644
--- a/mysql-test/r/trigger-compat.result
+++ b/mysql-test/main/trigger-compat.result
diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/main/trigger-compat.test
index 437df89b4b1..437df89b4b1 100644
--- a/mysql-test/t/trigger-compat.test
+++ b/mysql-test/main/trigger-compat.test
diff --git a/mysql-test/r/trigger-trans.result b/mysql-test/main/trigger-trans.result
index c58c4230a40..c58c4230a40 100644
--- a/mysql-test/r/trigger-trans.result
+++ b/mysql-test/main/trigger-trans.result
diff --git a/mysql-test/t/trigger-trans.test b/mysql-test/main/trigger-trans.test
index 17656c3516e..17656c3516e 100644
--- a/mysql-test/t/trigger-trans.test
+++ b/mysql-test/main/trigger-trans.test
diff --git a/mysql-test/r/trigger.result b/mysql-test/main/trigger.result
index 8473b3bb90d..8473b3bb90d 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/main/trigger.result
diff --git a/mysql-test/t/trigger.test b/mysql-test/main/trigger.test
index 1557ef200e5..1557ef200e5 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/main/trigger.test
diff --git a/mysql-test/r/trigger_no_defaults-11698.result b/mysql-test/main/trigger_no_defaults-11698.result
index 8ce495eaf3a..8ce495eaf3a 100644
--- a/mysql-test/r/trigger_no_defaults-11698.result
+++ b/mysql-test/main/trigger_no_defaults-11698.result
diff --git a/mysql-test/t/trigger_no_defaults-11698.test b/mysql-test/main/trigger_no_defaults-11698.test
index c10bec68314..c10bec68314 100644
--- a/mysql-test/t/trigger_no_defaults-11698.test
+++ b/mysql-test/main/trigger_no_defaults-11698.test
diff --git a/mysql-test/r/trigger_notembedded.result b/mysql-test/main/trigger_notembedded.result
index 3ee84c3c308..3ee84c3c308 100644
--- a/mysql-test/r/trigger_notembedded.result
+++ b/mysql-test/main/trigger_notembedded.result
diff --git a/mysql-test/t/trigger_notembedded.test b/mysql-test/main/trigger_notembedded.test
index a31594826e7..a31594826e7 100644
--- a/mysql-test/t/trigger_notembedded.test
+++ b/mysql-test/main/trigger_notembedded.test
diff --git a/mysql-test/r/trigger_null-8605.result b/mysql-test/main/trigger_null-8605.result
index 10315988708..10315988708 100644
--- a/mysql-test/r/trigger_null-8605.result
+++ b/mysql-test/main/trigger_null-8605.result
diff --git a/mysql-test/t/trigger_null-8605.test b/mysql-test/main/trigger_null-8605.test
index 34a57654b48..34a57654b48 100644
--- a/mysql-test/t/trigger_null-8605.test
+++ b/mysql-test/main/trigger_null-8605.test
diff --git a/mysql-test/r/trigger_wl3253.result b/mysql-test/main/trigger_wl3253.result
index bd2d250cb2f..bd2d250cb2f 100644
--- a/mysql-test/r/trigger_wl3253.result
+++ b/mysql-test/main/trigger_wl3253.result
diff --git a/mysql-test/t/trigger_wl3253.test b/mysql-test/main/trigger_wl3253.test
index 3504eeaf889..3504eeaf889 100644
--- a/mysql-test/t/trigger_wl3253.test
+++ b/mysql-test/main/trigger_wl3253.test
diff --git a/mysql-test/r/truncate-stale-6500.result b/mysql-test/main/truncate-stale-6500.result
index b6222716953..b6222716953 100644
--- a/mysql-test/r/truncate-stale-6500.result
+++ b/mysql-test/main/truncate-stale-6500.result
diff --git a/mysql-test/t/truncate-stale-6500.test b/mysql-test/main/truncate-stale-6500.test
index 47dffb1966d..47dffb1966d 100644
--- a/mysql-test/t/truncate-stale-6500.test
+++ b/mysql-test/main/truncate-stale-6500.test
diff --git a/mysql-test/r/truncate.result b/mysql-test/main/truncate.result
index 48839f0eadb..48839f0eadb 100644
--- a/mysql-test/r/truncate.result
+++ b/mysql-test/main/truncate.result
diff --git a/mysql-test/t/truncate.test b/mysql-test/main/truncate.test
index 8895677b79f..8895677b79f 100644
--- a/mysql-test/t/truncate.test
+++ b/mysql-test/main/truncate.test
diff --git a/mysql-test/r/truncate_badse.result b/mysql-test/main/truncate_badse.result
index 16f44f180ed..16f44f180ed 100644
--- a/mysql-test/r/truncate_badse.result
+++ b/mysql-test/main/truncate_badse.result
diff --git a/mysql-test/t/truncate_badse.test b/mysql-test/main/truncate_badse.test
index 71545cab11a..71545cab11a 100644
--- a/mysql-test/t/truncate_badse.test
+++ b/mysql-test/main/truncate_badse.test
diff --git a/mysql-test/r/truncate_coverage.result b/mysql-test/main/truncate_coverage.result
index 078de1ef3ab..078de1ef3ab 100644
--- a/mysql-test/r/truncate_coverage.result
+++ b/mysql-test/main/truncate_coverage.result
diff --git a/mysql-test/t/truncate_coverage.test b/mysql-test/main/truncate_coverage.test
index 3351ce84232..3351ce84232 100644
--- a/mysql-test/t/truncate_coverage.test
+++ b/mysql-test/main/truncate_coverage.test
diff --git a/mysql-test/r/type_binary.result b/mysql-test/main/type_binary.result
index 7dfe44ab045..7dfe44ab045 100644
--- a/mysql-test/r/type_binary.result
+++ b/mysql-test/main/type_binary.result
diff --git a/mysql-test/t/type_binary.test b/mysql-test/main/type_binary.test
index 952bc6ef231..952bc6ef231 100644
--- a/mysql-test/t/type_binary.test
+++ b/mysql-test/main/type_binary.test
diff --git a/mysql-test/r/type_bit.result b/mysql-test/main/type_bit.result
index 30cd94c9277..30cd94c9277 100644
--- a/mysql-test/r/type_bit.result
+++ b/mysql-test/main/type_bit.result
diff --git a/mysql-test/t/type_bit.test b/mysql-test/main/type_bit.test
index bb282fc15e5..bb282fc15e5 100644
--- a/mysql-test/t/type_bit.test
+++ b/mysql-test/main/type_bit.test
diff --git a/mysql-test/r/type_bit_innodb.result b/mysql-test/main/type_bit_innodb.result
index 9b186207f3f..9b186207f3f 100644
--- a/mysql-test/r/type_bit_innodb.result
+++ b/mysql-test/main/type_bit_innodb.result
diff --git a/mysql-test/t/type_bit_innodb.test b/mysql-test/main/type_bit_innodb.test
index 4c6f9bc1b49..4c6f9bc1b49 100644
--- a/mysql-test/t/type_bit_innodb.test
+++ b/mysql-test/main/type_bit_innodb.test
diff --git a/mysql-test/r/type_blob.result b/mysql-test/main/type_blob.result
index 569ba65df3f..569ba65df3f 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/main/type_blob.result
diff --git a/mysql-test/t/type_blob.test b/mysql-test/main/type_blob.test
index 8db6ac6da2a..8db6ac6da2a 100644
--- a/mysql-test/t/type_blob.test
+++ b/mysql-test/main/type_blob.test
diff --git a/mysql-test/r/type_date.result b/mysql-test/main/type_date.result
index 69bdf569787..69bdf569787 100644
--- a/mysql-test/r/type_date.result
+++ b/mysql-test/main/type_date.result
diff --git a/mysql-test/t/type_date.test b/mysql-test/main/type_date.test
index 8d29a54a26c..8d29a54a26c 100644
--- a/mysql-test/t/type_date.test
+++ b/mysql-test/main/type_date.test
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/main/type_datetime.result
index 74b761a2e8f..74b761a2e8f 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/main/type_datetime.result
diff --git a/mysql-test/t/type_datetime.test b/mysql-test/main/type_datetime.test
index dafa9f9456e..dafa9f9456e 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/main/type_datetime.test
diff --git a/mysql-test/r/type_datetime_hires.result b/mysql-test/main/type_datetime_hires.result
index 38e2c2a5ac8..38e2c2a5ac8 100644
--- a/mysql-test/r/type_datetime_hires.result
+++ b/mysql-test/main/type_datetime_hires.result
diff --git a/mysql-test/t/type_datetime_hires.test b/mysql-test/main/type_datetime_hires.test
index d220a4601eb..d220a4601eb 100644
--- a/mysql-test/t/type_datetime_hires.test
+++ b/mysql-test/main/type_datetime_hires.test
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/main/type_decimal.result
index f96f98e7a9b..f96f98e7a9b 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/main/type_decimal.result
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/main/type_decimal.test
index 903f375d1ae..903f375d1ae 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/main/type_decimal.test
diff --git a/mysql-test/r/type_enum.result b/mysql-test/main/type_enum.result
index 02d71c6bd9f..02d71c6bd9f 100644
--- a/mysql-test/r/type_enum.result
+++ b/mysql-test/main/type_enum.result
diff --git a/mysql-test/t/type_enum.test b/mysql-test/main/type_enum.test
index a79335960bc..a79335960bc 100644
--- a/mysql-test/t/type_enum.test
+++ b/mysql-test/main/type_enum.test
diff --git a/mysql-test/r/type_float.result b/mysql-test/main/type_float.result
index 57cdd1561df..57cdd1561df 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/main/type_float.result
diff --git a/mysql-test/t/type_float.test b/mysql-test/main/type_float.test
index 2d7c4428507..2d7c4428507 100644
--- a/mysql-test/t/type_float.test
+++ b/mysql-test/main/type_float.test
diff --git a/mysql-test/r/type_int.result b/mysql-test/main/type_int.result
index 39e2e91ecc7..39e2e91ecc7 100644
--- a/mysql-test/r/type_int.result
+++ b/mysql-test/main/type_int.result
diff --git a/mysql-test/t/type_int.test b/mysql-test/main/type_int.test
index 271b4d5862a..271b4d5862a 100644
--- a/mysql-test/t/type_int.test
+++ b/mysql-test/main/type_int.test
diff --git a/mysql-test/r/type_json.result b/mysql-test/main/type_json.result
index 2c1fdbe2b95..2c1fdbe2b95 100644
--- a/mysql-test/r/type_json.result
+++ b/mysql-test/main/type_json.result
diff --git a/mysql-test/t/type_json.test b/mysql-test/main/type_json.test
index 0cff9366145..0cff9366145 100644
--- a/mysql-test/t/type_json.test
+++ b/mysql-test/main/type_json.test
diff --git a/mysql-test/r/type_nchar.result b/mysql-test/main/type_nchar.result
index 95741d37e2a..95741d37e2a 100644
--- a/mysql-test/r/type_nchar.result
+++ b/mysql-test/main/type_nchar.result
diff --git a/mysql-test/t/type_nchar.test b/mysql-test/main/type_nchar.test
index f2258830450..f2258830450 100644
--- a/mysql-test/t/type_nchar.test
+++ b/mysql-test/main/type_nchar.test
diff --git a/mysql-test/r/type_newdecimal-big.result b/mysql-test/main/type_newdecimal-big.result
index 4e694702d14..4e694702d14 100644
--- a/mysql-test/r/type_newdecimal-big.result
+++ b/mysql-test/main/type_newdecimal-big.result
diff --git a/mysql-test/t/type_newdecimal-big.test b/mysql-test/main/type_newdecimal-big.test
index 9a1104e4fe6..9a1104e4fe6 100644
--- a/mysql-test/t/type_newdecimal-big.test
+++ b/mysql-test/main/type_newdecimal-big.test
diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/main/type_newdecimal.result
index ba84ff50504..ba84ff50504 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/main/type_newdecimal.result
diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/main/type_newdecimal.test
index dd5311e4be3..dd5311e4be3 100644
--- a/mysql-test/t/type_newdecimal.test
+++ b/mysql-test/main/type_newdecimal.test
diff --git a/mysql-test/r/type_num.result b/mysql-test/main/type_num.result
index 966d94ee385..966d94ee385 100644
--- a/mysql-test/r/type_num.result
+++ b/mysql-test/main/type_num.result
diff --git a/mysql-test/t/type_num.test b/mysql-test/main/type_num.test
index cc715d6cda2..cc715d6cda2 100644
--- a/mysql-test/t/type_num.test
+++ b/mysql-test/main/type_num.test
diff --git a/mysql-test/r/type_num_innodb.result b/mysql-test/main/type_num_innodb.result
index 581a387b2e8..581a387b2e8 100644
--- a/mysql-test/r/type_num_innodb.result
+++ b/mysql-test/main/type_num_innodb.result
diff --git a/mysql-test/t/type_num_innodb.test b/mysql-test/main/type_num_innodb.test
index 04bdd4c63b0..04bdd4c63b0 100644
--- a/mysql-test/t/type_num_innodb.test
+++ b/mysql-test/main/type_num_innodb.test
diff --git a/mysql-test/r/type_ranges.result b/mysql-test/main/type_ranges.result
index 784a394d8b5..784a394d8b5 100644
--- a/mysql-test/r/type_ranges.result
+++ b/mysql-test/main/type_ranges.result
diff --git a/mysql-test/t/type_ranges.test b/mysql-test/main/type_ranges.test
index 7bf29321d06..7bf29321d06 100644
--- a/mysql-test/t/type_ranges.test
+++ b/mysql-test/main/type_ranges.test
diff --git a/mysql-test/r/type_set.result b/mysql-test/main/type_set.result
index ae72619b5ae..ae72619b5ae 100644
--- a/mysql-test/r/type_set.result
+++ b/mysql-test/main/type_set.result
diff --git a/mysql-test/t/type_set.test b/mysql-test/main/type_set.test
index 637ad40c316..637ad40c316 100644
--- a/mysql-test/t/type_set.test
+++ b/mysql-test/main/type_set.test
diff --git a/mysql-test/r/type_temporal_innodb.result b/mysql-test/main/type_temporal_innodb.result
index b869822722d..b869822722d 100644
--- a/mysql-test/r/type_temporal_innodb.result
+++ b/mysql-test/main/type_temporal_innodb.result
diff --git a/mysql-test/t/type_temporal_innodb.test b/mysql-test/main/type_temporal_innodb.test
index 81f2f586c51..81f2f586c51 100644
--- a/mysql-test/t/type_temporal_innodb.test
+++ b/mysql-test/main/type_temporal_innodb.test
diff --git a/mysql-test/r/type_temporal_mysql56.result b/mysql-test/main/type_temporal_mysql56.result
index cdc951dac14..cdc951dac14 100644
--- a/mysql-test/r/type_temporal_mysql56.result
+++ b/mysql-test/main/type_temporal_mysql56.result
diff --git a/mysql-test/t/type_temporal_mysql56.test b/mysql-test/main/type_temporal_mysql56.test
index 98529bfe1c1..98529bfe1c1 100644
--- a/mysql-test/t/type_temporal_mysql56.test
+++ b/mysql-test/main/type_temporal_mysql56.test
diff --git a/mysql-test/r/type_time.result b/mysql-test/main/type_time.result
index 5cdd3b00924..5cdd3b00924 100644
--- a/mysql-test/r/type_time.result
+++ b/mysql-test/main/type_time.result
diff --git a/mysql-test/t/type_time.test b/mysql-test/main/type_time.test
index d8bb66fcd5c..d8bb66fcd5c 100644
--- a/mysql-test/t/type_time.test
+++ b/mysql-test/main/type_time.test
diff --git a/mysql-test/r/type_time_6065.result b/mysql-test/main/type_time_6065.result
index 56de96870b6..56de96870b6 100644
--- a/mysql-test/r/type_time_6065.result
+++ b/mysql-test/main/type_time_6065.result
diff --git a/mysql-test/t/type_time_6065.test b/mysql-test/main/type_time_6065.test
index fc91c530760..fc91c530760 100644
--- a/mysql-test/t/type_time_6065.test
+++ b/mysql-test/main/type_time_6065.test
diff --git a/mysql-test/r/type_time_hires.result b/mysql-test/main/type_time_hires.result
index 47185116bea..47185116bea 100644
--- a/mysql-test/r/type_time_hires.result
+++ b/mysql-test/main/type_time_hires.result
diff --git a/mysql-test/t/type_time_hires.test b/mysql-test/main/type_time_hires.test
index 3785a23f1eb..3785a23f1eb 100644
--- a/mysql-test/t/type_time_hires.test
+++ b/mysql-test/main/type_time_hires.test
diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/main/type_timestamp.result
index b0405bc4ad7..b0405bc4ad7 100644
--- a/mysql-test/r/type_timestamp.result
+++ b/mysql-test/main/type_timestamp.result
diff --git a/mysql-test/t/type_timestamp.test b/mysql-test/main/type_timestamp.test
index 6d81a86331a..6d81a86331a 100644
--- a/mysql-test/t/type_timestamp.test
+++ b/mysql-test/main/type_timestamp.test
diff --git a/mysql-test/r/type_timestamp_hires.result b/mysql-test/main/type_timestamp_hires.result
index fa6adc075ed..fa6adc075ed 100644
--- a/mysql-test/r/type_timestamp_hires.result
+++ b/mysql-test/main/type_timestamp_hires.result
diff --git a/mysql-test/t/type_timestamp_hires.test b/mysql-test/main/type_timestamp_hires.test
index 0b05f81ef42..0b05f81ef42 100644
--- a/mysql-test/t/type_timestamp_hires.test
+++ b/mysql-test/main/type_timestamp_hires.test
diff --git a/mysql-test/r/type_uint.result b/mysql-test/main/type_uint.result
index ef7a7ed98ca..ef7a7ed98ca 100644
--- a/mysql-test/r/type_uint.result
+++ b/mysql-test/main/type_uint.result
diff --git a/mysql-test/t/type_uint.test b/mysql-test/main/type_uint.test
index ae48b30997a..ae48b30997a 100644
--- a/mysql-test/t/type_uint.test
+++ b/mysql-test/main/type_uint.test
diff --git a/mysql-test/r/type_varchar.result b/mysql-test/main/type_varchar.result
index 0b2a5b54d08..0b2a5b54d08 100644
--- a/mysql-test/r/type_varchar.result
+++ b/mysql-test/main/type_varchar.result
diff --git a/mysql-test/t/type_varchar.test b/mysql-test/main/type_varchar.test
index d70cb86fa7b..d70cb86fa7b 100644
--- a/mysql-test/t/type_varchar.test
+++ b/mysql-test/main/type_varchar.test
diff --git a/mysql-test/r/type_year.result b/mysql-test/main/type_year.result
index 8d58659769e..8d58659769e 100644
--- a/mysql-test/r/type_year.result
+++ b/mysql-test/main/type_year.result
diff --git a/mysql-test/t/type_year.test b/mysql-test/main/type_year.test
index 117906fd889..117906fd889 100644
--- a/mysql-test/t/type_year.test
+++ b/mysql-test/main/type_year.test
diff --git a/mysql-test/r/udf.result b/mysql-test/main/udf.result
index 6af6b167511..6af6b167511 100644
--- a/mysql-test/r/udf.result
+++ b/mysql-test/main/udf.result
diff --git a/mysql-test/t/udf.test b/mysql-test/main/udf.test
index c3a25c6bcce..c3a25c6bcce 100644
--- a/mysql-test/t/udf.test
+++ b/mysql-test/main/udf.test
diff --git a/mysql-test/r/udf_debug_sync.result b/mysql-test/main/udf_debug_sync.result
index 8ce6dbdd5c0..8ce6dbdd5c0 100644
--- a/mysql-test/r/udf_debug_sync.result
+++ b/mysql-test/main/udf_debug_sync.result
diff --git a/mysql-test/t/udf_debug_sync.test b/mysql-test/main/udf_debug_sync.test
index 593500c1e18..593500c1e18 100644
--- a/mysql-test/t/udf_debug_sync.test
+++ b/mysql-test/main/udf_debug_sync.test
diff --git a/mysql-test/r/udf_notembedded.result b/mysql-test/main/udf_notembedded.result
index 377af563d3e..377af563d3e 100644
--- a/mysql-test/r/udf_notembedded.result
+++ b/mysql-test/main/udf_notembedded.result
diff --git a/mysql-test/t/udf_notembedded.test b/mysql-test/main/udf_notembedded.test
index d6658604005..d6658604005 100644
--- a/mysql-test/t/udf_notembedded.test
+++ b/mysql-test/main/udf_notembedded.test
diff --git a/mysql-test/r/udf_query_cache.result b/mysql-test/main/udf_query_cache.result
index 8c25c127012..8c25c127012 100644
--- a/mysql-test/r/udf_query_cache.result
+++ b/mysql-test/main/udf_query_cache.result
diff --git a/mysql-test/t/udf_query_cache.test b/mysql-test/main/udf_query_cache.test
index b0037973631..b0037973631 100644
--- a/mysql-test/t/udf_query_cache.test
+++ b/mysql-test/main/udf_query_cache.test
diff --git a/mysql-test/t/udf_skip_grants-master.opt b/mysql-test/main/udf_skip_grants-master.opt
index 5699a3387b8..5699a3387b8 100644
--- a/mysql-test/t/udf_skip_grants-master.opt
+++ b/mysql-test/main/udf_skip_grants-master.opt
diff --git a/mysql-test/r/udf_skip_grants.result b/mysql-test/main/udf_skip_grants.result
index 8d7081ebf6f..8d7081ebf6f 100644
--- a/mysql-test/r/udf_skip_grants.result
+++ b/mysql-test/main/udf_skip_grants.result
diff --git a/mysql-test/t/udf_skip_grants.test b/mysql-test/main/udf_skip_grants.test
index bd9402e0d8a..bd9402e0d8a 100644
--- a/mysql-test/t/udf_skip_grants.test
+++ b/mysql-test/main/udf_skip_grants.test
diff --git a/mysql-test/t/union-master.opt b/mysql-test/main/union-master.opt
index 57befa5c0a2..57befa5c0a2 100644
--- a/mysql-test/t/union-master.opt
+++ b/mysql-test/main/union-master.opt
diff --git a/mysql-test/r/union.result b/mysql-test/main/union.result
index 4e5f9312e03..4e5f9312e03 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/main/union.result
diff --git a/mysql-test/t/union.test b/mysql-test/main/union.test
index f86cae87524..f86cae87524 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/main/union.test
diff --git a/mysql-test/r/union_crash-714.result b/mysql-test/main/union_crash-714.result
index 4a51f88b76f..4a51f88b76f 100644
--- a/mysql-test/r/union_crash-714.result
+++ b/mysql-test/main/union_crash-714.result
diff --git a/mysql-test/t/union_crash-714.test b/mysql-test/main/union_crash-714.test
index 6c31a2202cb..6c31a2202cb 100644
--- a/mysql-test/t/union_crash-714.test
+++ b/mysql-test/main/union_crash-714.test
diff --git a/mysql-test/r/uniques_crash-7912.result b/mysql-test/main/uniques_crash-7912.result
index bf3aab684ae..bf3aab684ae 100644
--- a/mysql-test/r/uniques_crash-7912.result
+++ b/mysql-test/main/uniques_crash-7912.result
diff --git a/mysql-test/t/uniques_crash-7912.test b/mysql-test/main/uniques_crash-7912.test
index 8dc82f8f540..8dc82f8f540 100644
--- a/mysql-test/t/uniques_crash-7912.test
+++ b/mysql-test/main/uniques_crash-7912.test
diff --git a/mysql-test/t/unsafe_binlog_innodb-master.opt b/mysql-test/main/unsafe_binlog_innodb-master.opt
index 0d13f0834a5..0d13f0834a5 100644
--- a/mysql-test/t/unsafe_binlog_innodb-master.opt
+++ b/mysql-test/main/unsafe_binlog_innodb-master.opt
diff --git a/mysql-test/r/unsafe_binlog_innodb.result b/mysql-test/main/unsafe_binlog_innodb.result
index 0fe3d38035b..0fe3d38035b 100644
--- a/mysql-test/r/unsafe_binlog_innodb.result
+++ b/mysql-test/main/unsafe_binlog_innodb.result
diff --git a/mysql-test/t/unsafe_binlog_innodb.test b/mysql-test/main/unsafe_binlog_innodb.test
index a0516749451..a0516749451 100644
--- a/mysql-test/t/unsafe_binlog_innodb.test
+++ b/mysql-test/main/unsafe_binlog_innodb.test
diff --git a/mysql-test/r/update.result b/mysql-test/main/update.result
index 73ebb73e313..73ebb73e313 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/main/update.result
diff --git a/mysql-test/t/update.test b/mysql-test/main/update.test
index e5ef0b11127..e5ef0b11127 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/main/update.test
diff --git a/mysql-test/r/update_ignore_216.result b/mysql-test/main/update_ignore_216.result
index 4abc1eae06e..4abc1eae06e 100644
--- a/mysql-test/r/update_ignore_216.result
+++ b/mysql-test/main/update_ignore_216.result
diff --git a/mysql-test/t/update_ignore_216.test b/mysql-test/main/update_ignore_216.test
index bae3930e1a7..bae3930e1a7 100644
--- a/mysql-test/t/update_ignore_216.test
+++ b/mysql-test/main/update_ignore_216.test
diff --git a/mysql-test/r/update_innodb.result b/mysql-test/main/update_innodb.result
index 0a85c6dab3e..0a85c6dab3e 100644
--- a/mysql-test/r/update_innodb.result
+++ b/mysql-test/main/update_innodb.result
diff --git a/mysql-test/t/update_innodb.test b/mysql-test/main/update_innodb.test
index acc8aceab00..acc8aceab00 100644
--- a/mysql-test/t/update_innodb.test
+++ b/mysql-test/main/update_innodb.test
diff --git a/mysql-test/r/update_use_source.result b/mysql-test/main/update_use_source.result
index e5585fcee5d..e5585fcee5d 100644
--- a/mysql-test/r/update_use_source.result
+++ b/mysql-test/main/update_use_source.result
diff --git a/mysql-test/t/update_use_source.test b/mysql-test/main/update_use_source.test
index 7ed5f95d68d..7ed5f95d68d 100644
--- a/mysql-test/t/update_use_source.test
+++ b/mysql-test/main/update_use_source.test
diff --git a/mysql-test/r/upgrade.result b/mysql-test/main/upgrade.result
index 887a53887fe..887a53887fe 100644
--- a/mysql-test/r/upgrade.result
+++ b/mysql-test/main/upgrade.result
diff --git a/mysql-test/t/upgrade.test b/mysql-test/main/upgrade.test
index ab9330176f8..ab9330176f8 100644
--- a/mysql-test/t/upgrade.test
+++ b/mysql-test/main/upgrade.test
diff --git a/mysql-test/t/user_limits-master.opt b/mysql-test/main/user_limits-master.opt
index 107b2e4a27f..107b2e4a27f 100644
--- a/mysql-test/t/user_limits-master.opt
+++ b/mysql-test/main/user_limits-master.opt
diff --git a/mysql-test/r/user_limits.result b/mysql-test/main/user_limits.result
index bbf73d7c617..bbf73d7c617 100644
--- a/mysql-test/r/user_limits.result
+++ b/mysql-test/main/user_limits.result
diff --git a/mysql-test/t/user_limits.test b/mysql-test/main/user_limits.test
index ebb4fd4fb88..ebb4fd4fb88 100644
--- a/mysql-test/t/user_limits.test
+++ b/mysql-test/main/user_limits.test
diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/main/user_var-binlog.result
index 6066da2481a..6066da2481a 100644
--- a/mysql-test/r/user_var-binlog.result
+++ b/mysql-test/main/user_var-binlog.result
diff --git a/mysql-test/t/user_var-binlog.test b/mysql-test/main/user_var-binlog.test
index 0098f237de9..0098f237de9 100644
--- a/mysql-test/t/user_var-binlog.test
+++ b/mysql-test/main/user_var-binlog.test
diff --git a/mysql-test/r/user_var.result b/mysql-test/main/user_var.result
index bf3d4f6dada..bf3d4f6dada 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/main/user_var.result
diff --git a/mysql-test/t/user_var.test b/mysql-test/main/user_var.test
index 54ceb8fd3a5..54ceb8fd3a5 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/main/user_var.test
diff --git a/mysql-test/r/userstat-badlogin-4824.result b/mysql-test/main/userstat-badlogin-4824.result
index 6a38c2bd601..6a38c2bd601 100644
--- a/mysql-test/r/userstat-badlogin-4824.result
+++ b/mysql-test/main/userstat-badlogin-4824.result
diff --git a/mysql-test/t/userstat-badlogin-4824.test b/mysql-test/main/userstat-badlogin-4824.test
index 97370c1d081..97370c1d081 100644
--- a/mysql-test/t/userstat-badlogin-4824.test
+++ b/mysql-test/main/userstat-badlogin-4824.test
diff --git a/mysql-test/r/userstat.result b/mysql-test/main/userstat.result
index 1db891e0184..1db891e0184 100644
--- a/mysql-test/r/userstat.result
+++ b/mysql-test/main/userstat.result
diff --git a/mysql-test/t/userstat.test b/mysql-test/main/userstat.test
index 9ce3a32c442..9ce3a32c442 100644
--- a/mysql-test/t/userstat.test
+++ b/mysql-test/main/userstat.test
diff --git a/mysql-test/r/varbinary.result b/mysql-test/main/varbinary.result
index 58cab5ad1ca..58cab5ad1ca 100644
--- a/mysql-test/r/varbinary.result
+++ b/mysql-test/main/varbinary.result
diff --git a/mysql-test/t/varbinary.test b/mysql-test/main/varbinary.test
index f03f3fcf703..f03f3fcf703 100644
--- a/mysql-test/t/varbinary.test
+++ b/mysql-test/main/varbinary.test
diff --git a/mysql-test/t/variables-master.opt b/mysql-test/main/variables-master.opt
index e4b213a0323..e4b213a0323 100644
--- a/mysql-test/t/variables-master.opt
+++ b/mysql-test/main/variables-master.opt
diff --git a/mysql-test/t/variables-notembedded-master.opt b/mysql-test/main/variables-notembedded-master.opt
index 8a173a043ac..8a173a043ac 100644
--- a/mysql-test/t/variables-notembedded-master.opt
+++ b/mysql-test/main/variables-notembedded-master.opt
diff --git a/mysql-test/r/variables-notembedded.result b/mysql-test/main/variables-notembedded.result
index a8bf7ecc429..a8bf7ecc429 100644
--- a/mysql-test/r/variables-notembedded.result
+++ b/mysql-test/main/variables-notembedded.result
diff --git a/mysql-test/t/variables-notembedded.test b/mysql-test/main/variables-notembedded.test
index 2aa77e1e254..2aa77e1e254 100644
--- a/mysql-test/t/variables-notembedded.test
+++ b/mysql-test/main/variables-notembedded.test
diff --git a/mysql-test/r/variables.result b/mysql-test/main/variables.result
index 89b2367cec8..89b2367cec8 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/main/variables.result
diff --git a/mysql-test/t/variables.test b/mysql-test/main/variables.test
index 4da3cac3a73..4da3cac3a73 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/main/variables.test
diff --git a/mysql-test/r/variables_community.result b/mysql-test/main/variables_community.result
index 7a2976d1267..7a2976d1267 100644
--- a/mysql-test/r/variables_community.result
+++ b/mysql-test/main/variables_community.result
diff --git a/mysql-test/t/variables_community.test b/mysql-test/main/variables_community.test
index aa4bc6c631c..aa4bc6c631c 100644
--- a/mysql-test/t/variables_community.test
+++ b/mysql-test/main/variables_community.test
diff --git a/mysql-test/r/view.result b/mysql-test/main/view.result
index e61e2d2663d..e61e2d2663d 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/main/view.result
diff --git a/mysql-test/t/view.test b/mysql-test/main/view.test
index f78ddd6f49e..f78ddd6f49e 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/main/view.test
diff --git a/mysql-test/r/view_alias.result b/mysql-test/main/view_alias.result
index f3ae7aef3a6..f3ae7aef3a6 100644
--- a/mysql-test/r/view_alias.result
+++ b/mysql-test/main/view_alias.result
diff --git a/mysql-test/t/view_alias.test b/mysql-test/main/view_alias.test
index 09d707296bb..09d707296bb 100644
--- a/mysql-test/t/view_alias.test
+++ b/mysql-test/main/view_alias.test
diff --git a/mysql-test/r/view_debug.result b/mysql-test/main/view_debug.result
index cfb70b5e74c..cfb70b5e74c 100644
--- a/mysql-test/r/view_debug.result
+++ b/mysql-test/main/view_debug.result
diff --git a/mysql-test/t/view_debug.test b/mysql-test/main/view_debug.test
index 0e448ae2721..0e448ae2721 100644
--- a/mysql-test/t/view_debug.test
+++ b/mysql-test/main/view_debug.test
diff --git a/mysql-test/r/view_grant.result b/mysql-test/main/view_grant.result
index 82594128d85..82594128d85 100644
--- a/mysql-test/r/view_grant.result
+++ b/mysql-test/main/view_grant.result
diff --git a/mysql-test/t/view_grant.test b/mysql-test/main/view_grant.test
index a70241138aa..a70241138aa 100644
--- a/mysql-test/t/view_grant.test
+++ b/mysql-test/main/view_grant.test
diff --git a/mysql-test/r/wait_timeout.result b/mysql-test/main/wait_timeout.result
index 8e5e5147f8b..8e5e5147f8b 100644
--- a/mysql-test/r/wait_timeout.result
+++ b/mysql-test/main/wait_timeout.result
diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/main/wait_timeout.test
index 84841aabb8b..84841aabb8b 100644
--- a/mysql-test/t/wait_timeout.test
+++ b/mysql-test/main/wait_timeout.test
diff --git a/mysql-test/t/warnings-master.opt b/mysql-test/main/warnings-master.opt
index 1aa6001465b..1aa6001465b 100644
--- a/mysql-test/t/warnings-master.opt
+++ b/mysql-test/main/warnings-master.opt
diff --git a/mysql-test/r/warnings.result b/mysql-test/main/warnings.result
index 7c7e049ff2d..7c7e049ff2d 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/main/warnings.result
diff --git a/mysql-test/t/warnings.test b/mysql-test/main/warnings.test
index 9360d32f93d..9360d32f93d 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/main/warnings.test
diff --git a/mysql-test/r/warnings_debug.result b/mysql-test/main/warnings_debug.result
index 4cdce7a5feb..4cdce7a5feb 100644
--- a/mysql-test/r/warnings_debug.result
+++ b/mysql-test/main/warnings_debug.result
diff --git a/mysql-test/t/warnings_debug.test b/mysql-test/main/warnings_debug.test
index 3055e3894e5..3055e3894e5 100644
--- a/mysql-test/t/warnings_debug.test
+++ b/mysql-test/main/warnings_debug.test
diff --git a/mysql-test/r/warnings_engine_disabled.result b/mysql-test/main/warnings_engine_disabled.result
index d9e490ba18f..d9e490ba18f 100644
--- a/mysql-test/r/warnings_engine_disabled.result
+++ b/mysql-test/main/warnings_engine_disabled.result
diff --git a/mysql-test/t/warnings_engine_disabled.test b/mysql-test/main/warnings_engine_disabled.test
index 46c686aa6d6..46c686aa6d6 100644
--- a/mysql-test/t/warnings_engine_disabled.test
+++ b/mysql-test/main/warnings_engine_disabled.test
diff --git a/mysql-test/r/win.result b/mysql-test/main/win.result
index dd4d09bb1eb..dd4d09bb1eb 100644
--- a/mysql-test/r/win.result
+++ b/mysql-test/main/win.result
diff --git a/mysql-test/t/win.test b/mysql-test/main/win.test
index c46aaecfbbf..c46aaecfbbf 100644
--- a/mysql-test/t/win.test
+++ b/mysql-test/main/win.test
diff --git a/mysql-test/r/win_as_arg_to_aggregate_func.result b/mysql-test/main/win_as_arg_to_aggregate_func.result
index e3f0091d6d2..e3f0091d6d2 100644
--- a/mysql-test/r/win_as_arg_to_aggregate_func.result
+++ b/mysql-test/main/win_as_arg_to_aggregate_func.result
diff --git a/mysql-test/t/win_as_arg_to_aggregate_func.test b/mysql-test/main/win_as_arg_to_aggregate_func.test
index 93c9238bedf..93c9238bedf 100644
--- a/mysql-test/t/win_as_arg_to_aggregate_func.test
+++ b/mysql-test/main/win_as_arg_to_aggregate_func.test
diff --git a/mysql-test/r/win_avg.result b/mysql-test/main/win_avg.result
index 7e539d933d8..7e539d933d8 100644
--- a/mysql-test/r/win_avg.result
+++ b/mysql-test/main/win_avg.result
diff --git a/mysql-test/t/win_avg.test b/mysql-test/main/win_avg.test
index 23a3652d943..23a3652d943 100644
--- a/mysql-test/t/win_avg.test
+++ b/mysql-test/main/win_avg.test
diff --git a/mysql-test/r/win_big-mdev-10092.result b/mysql-test/main/win_big-mdev-10092.result
index dc8b7b9c3bd..dc8b7b9c3bd 100644
--- a/mysql-test/r/win_big-mdev-10092.result
+++ b/mysql-test/main/win_big-mdev-10092.result
diff --git a/mysql-test/t/win_big-mdev-10092.test b/mysql-test/main/win_big-mdev-10092.test
index 090d43b0b7b..090d43b0b7b 100644
--- a/mysql-test/t/win_big-mdev-10092.test
+++ b/mysql-test/main/win_big-mdev-10092.test
diff --git a/mysql-test/r/win_big-mdev-11697.result b/mysql-test/main/win_big-mdev-11697.result
index e5dc271839c..e5dc271839c 100644
--- a/mysql-test/r/win_big-mdev-11697.result
+++ b/mysql-test/main/win_big-mdev-11697.result
diff --git a/mysql-test/t/win_big-mdev-11697.test b/mysql-test/main/win_big-mdev-11697.test
index 7103b8522be..7103b8522be 100644
--- a/mysql-test/t/win_big-mdev-11697.test
+++ b/mysql-test/main/win_big-mdev-11697.test
diff --git a/mysql-test/r/win_big.result b/mysql-test/main/win_big.result
index c8b27b9a1aa..c8b27b9a1aa 100644
--- a/mysql-test/r/win_big.result
+++ b/mysql-test/main/win_big.result
diff --git a/mysql-test/t/win_big.test b/mysql-test/main/win_big.test
index 09c8d640b09..09c8d640b09 100644
--- a/mysql-test/t/win_big.test
+++ b/mysql-test/main/win_big.test
diff --git a/mysql-test/r/win_bit.result b/mysql-test/main/win_bit.result
index ac7625beb90..ac7625beb90 100644
--- a/mysql-test/r/win_bit.result
+++ b/mysql-test/main/win_bit.result
diff --git a/mysql-test/t/win_bit.test b/mysql-test/main/win_bit.test
index f077d0d67a0..f077d0d67a0 100644
--- a/mysql-test/t/win_bit.test
+++ b/mysql-test/main/win_bit.test
diff --git a/mysql-test/r/win_empty_over.result b/mysql-test/main/win_empty_over.result
index a5ee74b943a..a5ee74b943a 100644
--- a/mysql-test/r/win_empty_over.result
+++ b/mysql-test/main/win_empty_over.result
diff --git a/mysql-test/t/win_empty_over.test b/mysql-test/main/win_empty_over.test
index 91344d76865..91344d76865 100644
--- a/mysql-test/t/win_empty_over.test
+++ b/mysql-test/main/win_empty_over.test
diff --git a/mysql-test/r/win_first_last_value.result b/mysql-test/main/win_first_last_value.result
index 9de394ef9e0..9de394ef9e0 100644
--- a/mysql-test/r/win_first_last_value.result
+++ b/mysql-test/main/win_first_last_value.result
diff --git a/mysql-test/t/win_first_last_value.test b/mysql-test/main/win_first_last_value.test
index 0a90a98a5d4..0a90a98a5d4 100644
--- a/mysql-test/t/win_first_last_value.test
+++ b/mysql-test/main/win_first_last_value.test
diff --git a/mysql-test/r/win_i_s.result b/mysql-test/main/win_i_s.result
index 8678c455b45..8678c455b45 100644
--- a/mysql-test/r/win_i_s.result
+++ b/mysql-test/main/win_i_s.result
diff --git a/mysql-test/t/win_i_s.test b/mysql-test/main/win_i_s.test
index d9b0f190285..d9b0f190285 100644
--- a/mysql-test/t/win_i_s.test
+++ b/mysql-test/main/win_i_s.test
diff --git a/mysql-test/r/win_insert_select.result b/mysql-test/main/win_insert_select.result
index bb25d052840..bb25d052840 100644
--- a/mysql-test/r/win_insert_select.result
+++ b/mysql-test/main/win_insert_select.result
diff --git a/mysql-test/t/win_insert_select.test b/mysql-test/main/win_insert_select.test
index 6b2e0da4175..6b2e0da4175 100644
--- a/mysql-test/t/win_insert_select.test
+++ b/mysql-test/main/win_insert_select.test
diff --git a/mysql-test/r/win_lead_lag.result b/mysql-test/main/win_lead_lag.result
index 5ead58fa11a..5ead58fa11a 100644
--- a/mysql-test/r/win_lead_lag.result
+++ b/mysql-test/main/win_lead_lag.result
diff --git a/mysql-test/t/win_lead_lag.test b/mysql-test/main/win_lead_lag.test
index 2824f83789c..2824f83789c 100644
--- a/mysql-test/t/win_lead_lag.test
+++ b/mysql-test/main/win_lead_lag.test
diff --git a/mysql-test/r/win_min_max.result b/mysql-test/main/win_min_max.result
index b3a90262bf7..b3a90262bf7 100644
--- a/mysql-test/r/win_min_max.result
+++ b/mysql-test/main/win_min_max.result
diff --git a/mysql-test/t/win_min_max.test b/mysql-test/main/win_min_max.test
index 8efde87ffdf..8efde87ffdf 100644
--- a/mysql-test/t/win_min_max.test
+++ b/mysql-test/main/win_min_max.test
diff --git a/mysql-test/r/win_nth_value.result b/mysql-test/main/win_nth_value.result
index abda1a2377f..abda1a2377f 100644
--- a/mysql-test/r/win_nth_value.result
+++ b/mysql-test/main/win_nth_value.result
diff --git a/mysql-test/t/win_nth_value.test b/mysql-test/main/win_nth_value.test
index b9764d1e9d7..b9764d1e9d7 100644
--- a/mysql-test/t/win_nth_value.test
+++ b/mysql-test/main/win_nth_value.test
diff --git a/mysql-test/r/win_ntile.result b/mysql-test/main/win_ntile.result
index 41cb1a594bf..41cb1a594bf 100644
--- a/mysql-test/r/win_ntile.result
+++ b/mysql-test/main/win_ntile.result
diff --git a/mysql-test/t/win_ntile.test b/mysql-test/main/win_ntile.test
index 6f12e1f4005..6f12e1f4005 100644
--- a/mysql-test/t/win_ntile.test
+++ b/mysql-test/main/win_ntile.test
diff --git a/mysql-test/r/win_orderby.result b/mysql-test/main/win_orderby.result
index bf4a40a4db3..bf4a40a4db3 100644
--- a/mysql-test/r/win_orderby.result
+++ b/mysql-test/main/win_orderby.result
diff --git a/mysql-test/t/win_orderby.test b/mysql-test/main/win_orderby.test
index 0d42c606486..0d42c606486 100644
--- a/mysql-test/t/win_orderby.test
+++ b/mysql-test/main/win_orderby.test
diff --git a/mysql-test/r/win_percent_cume.result b/mysql-test/main/win_percent_cume.result
index d38c95c9ea7..d38c95c9ea7 100644
--- a/mysql-test/r/win_percent_cume.result
+++ b/mysql-test/main/win_percent_cume.result
diff --git a/mysql-test/t/win_percent_cume.test b/mysql-test/main/win_percent_cume.test
index b851185cb32..b851185cb32 100644
--- a/mysql-test/t/win_percent_cume.test
+++ b/mysql-test/main/win_percent_cume.test
diff --git a/mysql-test/r/win_percentile.result b/mysql-test/main/win_percentile.result
index c51e2e6bd51..c51e2e6bd51 100644
--- a/mysql-test/r/win_percentile.result
+++ b/mysql-test/main/win_percentile.result
diff --git a/mysql-test/t/win_percentile.test b/mysql-test/main/win_percentile.test
index 468d8cff56b..468d8cff56b 100644
--- a/mysql-test/t/win_percentile.test
+++ b/mysql-test/main/win_percentile.test
diff --git a/mysql-test/r/win_rank.result b/mysql-test/main/win_rank.result
index 725683d3869..725683d3869 100644
--- a/mysql-test/r/win_rank.result
+++ b/mysql-test/main/win_rank.result
diff --git a/mysql-test/t/win_rank.test b/mysql-test/main/win_rank.test
index eda1f458205..eda1f458205 100644
--- a/mysql-test/t/win_rank.test
+++ b/mysql-test/main/win_rank.test
diff --git a/mysql-test/r/win_std.result b/mysql-test/main/win_std.result
index 36d99eec425..36d99eec425 100644
--- a/mysql-test/r/win_std.result
+++ b/mysql-test/main/win_std.result
diff --git a/mysql-test/t/win_std.test b/mysql-test/main/win_std.test
index 5ed999431c0..5ed999431c0 100644
--- a/mysql-test/t/win_std.test
+++ b/mysql-test/main/win_std.test
diff --git a/mysql-test/r/win_sum.result b/mysql-test/main/win_sum.result
index 66a48fe8293..66a48fe8293 100644
--- a/mysql-test/r/win_sum.result
+++ b/mysql-test/main/win_sum.result
diff --git a/mysql-test/t/win_sum.test b/mysql-test/main/win_sum.test
index aa4965bfd5a..aa4965bfd5a 100644
--- a/mysql-test/t/win_sum.test
+++ b/mysql-test/main/win_sum.test
diff --git a/mysql-test/r/windows.result b/mysql-test/main/windows.result
index 05e4600f4b7..05e4600f4b7 100644
--- a/mysql-test/r/windows.result
+++ b/mysql-test/main/windows.result
diff --git a/mysql-test/t/windows.test b/mysql-test/main/windows.test
index 617daba6b8e..617daba6b8e 100644
--- a/mysql-test/t/windows.test
+++ b/mysql-test/main/windows.test
diff --git a/mysql-test/t/wl4435_generated.inc b/mysql-test/main/wl4435_generated.inc
index 5ea05a89402..5ea05a89402 100644
--- a/mysql-test/t/wl4435_generated.inc
+++ b/mysql-test/main/wl4435_generated.inc
diff --git a/mysql-test/r/xa.result b/mysql-test/main/xa.result
index 46bfa6e962a..46bfa6e962a 100644
--- a/mysql-test/r/xa.result
+++ b/mysql-test/main/xa.result
diff --git a/mysql-test/t/xa.test b/mysql-test/main/xa.test
index b5ef5a118b1..b5ef5a118b1 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/main/xa.test
diff --git a/mysql-test/r/xa_binlog.result b/mysql-test/main/xa_binlog.result
index 619a6e08b20..619a6e08b20 100644
--- a/mysql-test/r/xa_binlog.result
+++ b/mysql-test/main/xa_binlog.result
diff --git a/mysql-test/t/xa_binlog.test b/mysql-test/main/xa_binlog.test
index ecbf1f4f066..ecbf1f4f066 100644
--- a/mysql-test/t/xa_binlog.test
+++ b/mysql-test/main/xa_binlog.test
diff --git a/mysql-test/r/xa_sync.result b/mysql-test/main/xa_sync.result
index 1482ff5cacf..1482ff5cacf 100644
--- a/mysql-test/r/xa_sync.result
+++ b/mysql-test/main/xa_sync.result
diff --git a/mysql-test/t/xa_sync.test b/mysql-test/main/xa_sync.test
index bb95af7c0ba..bb95af7c0ba 100644
--- a/mysql-test/t/xa_sync.test
+++ b/mysql-test/main/xa_sync.test
diff --git a/mysql-test/r/xml.result b/mysql-test/main/xml.result
index 2cd70c08a94..2cd70c08a94 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/main/xml.result
diff --git a/mysql-test/t/xml.test b/mysql-test/main/xml.test
index b567f03a431..b567f03a431 100644
--- a/mysql-test/t/xml.test
+++ b/mysql-test/main/xml.test
diff --git a/mysql-test/r/xtradb_mrr.result b/mysql-test/main/xtradb_mrr.result
index f49207c0e41..f49207c0e41 100644
--- a/mysql-test/r/xtradb_mrr.result
+++ b/mysql-test/main/xtradb_mrr.result
diff --git a/mysql-test/t/xtradb_mrr.test b/mysql-test/main/xtradb_mrr.test
index 3e84668955a..3e84668955a 100644
--- a/mysql-test/t/xtradb_mrr.test
+++ b/mysql-test/main/xtradb_mrr.test
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 048f34d6d1d..fcd44bde846 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -5995,7 +5995,7 @@ path-to-testcase
 Examples:
 
 alias
-main.alias              'main' is the name of the suite for the 't' directory.
+main.alias              'main' is the name of the main test suite
 rpl.rpl_invoked_features,mix,innodb
 suite/rpl/t/rpl.rpl_invoked_features
 
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 0baa8a41639..651b99f31a5 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -45,7 +45,7 @@ sub skip_combinations {
 
   $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
 
-  $skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb'
+  $skip{'main/plugin_loaderr.test'} = 'needs compiled-in innodb'
             unless $::mysqld_variables{'innodb'} eq "ON";
 
   # disable tests that use ipv6, if unsupported
@@ -59,11 +59,11 @@ sub skip_combinations {
   }
   $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
 
-  $skip{'t/openssl_6975.test'} = 'no or too old openssl'
+  $skip{'main/openssl_6975.test'} = 'no or too old openssl'
     unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
        and $1 ge "1.0.1d";
 
-  $skip{'t/ssl_7937.combinations'} = [ 'x509v3' ]
+  $skip{'main/ssl_7937.combinations'} = [ 'x509v3' ]
     unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
        and $1 ge "1.0.2";
 
diff --git a/mysql-test/suite/innodb_gis/t/innodb_gis_rtree.test b/mysql-test/suite/innodb_gis/t/innodb_gis_rtree.test
index 85d6948c8aa..53e12994849 100644
--- a/mysql-test/suite/innodb_gis/t/innodb_gis_rtree.test
+++ b/mysql-test/suite/innodb_gis/t/innodb_gis_rtree.test
@@ -1,3 +1,3 @@
 -- source include/innodb_page_size.inc
 -- source include/innodb_row_format.inc
--- source ../../../t/gis-rtree.test
+-- source ../../../main/gis-rtree.test
diff --git a/mysql-test/t/delimiter_command_case_sensitivity.test b/mysql-test/t/delimiter_command_case_sensitivity.test
deleted file mode 100644
index 11d1cf75aa0..00000000000
--- a/mysql-test/t/delimiter_command_case_sensitivity.test
+++ /dev/null
@@ -1,4 +0,0 @@
-source include/not_embedded.inc;
-
-# MDEV-10728
---exec $MYSQL --default-character-set=binary < "t/delimiter_case_mdev_10728.sql"