diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install index 3cd11e1aea9..9e5356d061f 100644 --- a/debian/mariadb-test-data.install +++ b/debian/mariadb-test-data.install @@ -1,9 +1,7 @@ usr/share/mysql/mysql-test/collections -usr/share/mysql/mysql-test/extra usr/share/mysql/mysql-test/include usr/share/mysql/mysql-test/plugin -usr/share/mysql/mysql-test/r +usr/share/mysql/mysql-test/main usr/share/mysql/mysql-test/std_data usr/share/mysql/mysql-test/suite -usr/share/mysql/mysql-test/t usr/share/mysql/mysql-test/unstable-tests diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index e1de4074310..f715825274c 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -27,7 +27,6 @@ usr/share/mysql/mysql-test/README usr/share/mysql/mysql-test/README-gcov usr/share/mysql/mysql-test/README.stress usr/share/mysql/mysql-test/dgcov.pl -usr/share/mysql/mysql-test/disabled.def usr/share/mysql/mysql-test/lib usr/share/mysql/mysql-test/mysql-stress-test.pl usr/share/mysql/mysql-test/mysql-test-run.pl 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 similarity index 100% rename from mysql-test/r/big_test.require rename to 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 similarity index 100% rename from mysql-test/r/case_insensitive_file_system.require rename to 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 similarity index 100% rename from mysql-test/r/case_insensitive_fs.require rename to 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 similarity index 100% rename from mysql-test/r/case_sensitive_file_system.require rename to 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 similarity index 100% rename from mysql-test/r/check_var_limit.require rename to 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 similarity index 100% rename from mysql-test/r/have_compress.require rename to 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 similarity index 100% rename from mysql-test/r/have_geometry.require rename to 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 similarity index 100% rename from mysql-test/r/have_local_infile.require rename to 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 similarity index 100% rename from mysql-test/r/have_log_bin.require rename to 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 similarity index 100% rename from mysql-test/r/have_met_timezone.require rename to 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 similarity index 100% rename from mysql-test/r/have_moscow_leap_timezone.require rename to 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 similarity index 100% rename from mysql-test/r/have_outfile.require rename to mysql-test/include/have_outfile.require diff --git a/mysql-test/r/have_perror.require b/mysql-test/include/have_perror.require similarity index 100% rename from mysql-test/r/have_perror.require rename to 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 similarity index 100% rename from mysql-test/r/have_pool_of_threads.require rename to 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 similarity index 100% rename from mysql-test/r/have_profiling.require rename to 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 similarity index 100% rename from mysql-test/r/have_query_cache.require rename to 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 similarity index 100% rename from mysql-test/r/have_symlink.require rename to 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 similarity index 100% rename from mysql-test/r/have_utf16.require rename to 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 similarity index 100% rename from mysql-test/r/have_utf32.require rename to 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 similarity index 100% rename from mysql-test/r/have_utf8mb4.require rename to 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 similarity index 100% rename from mysql-test/r/have_working_dns.require rename to mysql-test/include/have_working_dns.require diff --git a/mysql-test/r/lowercase0.require b/mysql-test/include/lowercase0.require similarity index 100% rename from mysql-test/r/lowercase0.require rename to mysql-test/include/lowercase0.require diff --git a/mysql-test/r/lowercase1.require b/mysql-test/include/lowercase1.require similarity index 100% rename from mysql-test/r/lowercase1.require rename to mysql-test/include/lowercase1.require diff --git a/mysql-test/r/lowercase2.require b/mysql-test/include/lowercase2.require similarity index 100% rename from mysql-test/r/lowercase2.require rename to 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 similarity index 100% rename from mysql-test/r/not_staging.require rename to mysql-test/include/not_staging.require diff --git a/mysql-test/r/not_true.require b/mysql-test/include/not_true.require similarity index 100% rename from mysql-test/r/not_true.require rename to 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 similarity index 100% rename from mysql-test/r/not_valgrind.require rename to 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 similarity index 100% rename from mysql-test/r/one_thread_per_connection.require rename to mysql-test/include/one_thread_per_connection.require diff --git a/mysql-test/r/true.require b/mysql-test/include/true.require similarity index 100% rename from mysql-test/r/true.require rename to 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 similarity index 100% rename from mysql-test/r/1st.result rename to mysql-test/main/1st.result diff --git a/mysql-test/t/1st.test b/mysql-test/main/1st.test similarity index 100% rename from mysql-test/t/1st.test rename to mysql-test/main/1st.test diff --git a/mysql-test/r/aborted_clients.result b/mysql-test/main/aborted_clients.result similarity index 100% rename from mysql-test/r/aborted_clients.result rename to mysql-test/main/aborted_clients.result diff --git a/mysql-test/t/aborted_clients.test b/mysql-test/main/aborted_clients.test similarity index 100% rename from mysql-test/t/aborted_clients.test rename to mysql-test/main/aborted_clients.test diff --git a/mysql-test/r/adddate_454.result b/mysql-test/main/adddate_454.result similarity index 100% rename from mysql-test/r/adddate_454.result rename to mysql-test/main/adddate_454.result diff --git a/mysql-test/t/adddate_454.test b/mysql-test/main/adddate_454.test similarity index 100% rename from mysql-test/t/adddate_454.test rename to mysql-test/main/adddate_454.test diff --git a/mysql-test/r/alias.result b/mysql-test/main/alias.result similarity index 100% rename from mysql-test/r/alias.result rename to mysql-test/main/alias.result diff --git a/mysql-test/t/alias.test b/mysql-test/main/alias.test similarity index 100% rename from mysql-test/t/alias.test rename to mysql-test/main/alias.test diff --git a/mysql-test/r/almost_full.result b/mysql-test/main/almost_full.result similarity index 100% rename from mysql-test/r/almost_full.result rename to mysql-test/main/almost_full.result diff --git a/mysql-test/t/almost_full.test b/mysql-test/main/almost_full.test similarity index 100% rename from mysql-test/t/almost_full.test rename to mysql-test/main/almost_full.test diff --git a/mysql-test/r/alter_table-big.result b/mysql-test/main/alter_table-big.result similarity index 100% rename from mysql-test/r/alter_table-big.result rename to 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 similarity index 100% rename from mysql-test/t/alter_table-big.test rename to mysql-test/main/alter_table-big.test diff --git a/mysql-test/r/alter_table.result b/mysql-test/main/alter_table.result similarity index 100% rename from mysql-test/r/alter_table.result rename to mysql-test/main/alter_table.result diff --git a/mysql-test/t/alter_table.test b/mysql-test/main/alter_table.test similarity index 100% rename from mysql-test/t/alter_table.test rename to 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 similarity index 100% rename from mysql-test/r/alter_table_autoinc-5574.result rename to 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 similarity index 100% rename from mysql-test/t/alter_table_autoinc-5574.test rename to 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 similarity index 100% rename from mysql-test/r/alter_table_mdev539_maria.result rename to 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 similarity index 100% rename from mysql-test/t/alter_table_mdev539_maria.test rename to 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 similarity index 100% rename from mysql-test/r/alter_table_mdev539_myisam.result rename to 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 similarity index 100% rename from mysql-test/t/alter_table_mdev539_myisam.test rename to 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 similarity index 100% rename from mysql-test/r/alter_table_online.result rename to 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 similarity index 100% rename from mysql-test/t/alter_table_online.test rename to 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 similarity index 100% rename from mysql-test/r/alter_table_trans.result rename to 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 similarity index 100% rename from mysql-test/t/alter_table_trans.test rename to mysql-test/main/alter_table_trans.test diff --git a/mysql-test/r/alter_user.result b/mysql-test/main/alter_user.result similarity index 100% rename from mysql-test/r/alter_user.result rename to mysql-test/main/alter_user.result diff --git a/mysql-test/t/alter_user.test b/mysql-test/main/alter_user.test similarity index 100% rename from mysql-test/t/alter_user.test rename to mysql-test/main/alter_user.test diff --git a/mysql-test/r/analyze.result b/mysql-test/main/analyze.result similarity index 100% rename from mysql-test/r/analyze.result rename to mysql-test/main/analyze.result diff --git a/mysql-test/t/analyze.test b/mysql-test/main/analyze.test similarity index 100% rename from mysql-test/t/analyze.test rename to mysql-test/main/analyze.test diff --git a/mysql-test/r/analyze_debug.result b/mysql-test/main/analyze_debug.result similarity index 100% rename from mysql-test/r/analyze_debug.result rename to mysql-test/main/analyze_debug.result diff --git a/mysql-test/t/analyze_debug.test b/mysql-test/main/analyze_debug.test similarity index 100% rename from mysql-test/t/analyze_debug.test rename to mysql-test/main/analyze_debug.test diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/main/analyze_format_json.result similarity index 100% rename from mysql-test/r/analyze_format_json.result rename to 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 similarity index 100% rename from mysql-test/t/analyze_format_json.test rename to mysql-test/main/analyze_format_json.test diff --git a/mysql-test/r/analyze_stmt.result b/mysql-test/main/analyze_stmt.result similarity index 100% rename from mysql-test/r/analyze_stmt.result rename to mysql-test/main/analyze_stmt.result diff --git a/mysql-test/t/analyze_stmt.test b/mysql-test/main/analyze_stmt.test similarity index 100% rename from mysql-test/t/analyze_stmt.test rename to mysql-test/main/analyze_stmt.test diff --git a/mysql-test/r/analyze_stmt_orderby.result b/mysql-test/main/analyze_stmt_orderby.result similarity index 100% rename from mysql-test/r/analyze_stmt_orderby.result rename to 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 similarity index 100% rename from mysql-test/t/analyze_stmt_orderby.test rename to 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 similarity index 100% rename from mysql-test/r/analyze_stmt_privileges.result rename to 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 similarity index 100% rename from mysql-test/t/analyze_stmt_privileges.test rename to 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 similarity index 100% rename from mysql-test/r/analyze_stmt_privileges2.result rename to 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 similarity index 100% rename from mysql-test/t/analyze_stmt_privileges2.test rename to 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 similarity index 100% rename from mysql-test/t/analyze_stmt_slow_query_log-master.opt rename to 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 similarity index 100% rename from mysql-test/r/analyze_stmt_slow_query_log.result rename to 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 similarity index 100% rename from mysql-test/t/analyze_stmt_slow_query_log.test rename to mysql-test/main/analyze_stmt_slow_query_log.test diff --git a/mysql-test/r/ansi.result b/mysql-test/main/ansi.result similarity index 100% rename from mysql-test/r/ansi.result rename to mysql-test/main/ansi.result diff --git a/mysql-test/t/ansi.test b/mysql-test/main/ansi.test similarity index 100% rename from mysql-test/t/ansi.test rename to 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 similarity index 100% rename from mysql-test/r/assign_key_cache-5405.result rename to 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 similarity index 100% rename from mysql-test/t/assign_key_cache-5405.test rename to 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 similarity index 100% rename from mysql-test/t/auth_named_pipe-master.opt rename to 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 similarity index 100% rename from mysql-test/r/auth_named_pipe.result rename to 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 similarity index 100% rename from mysql-test/t/auth_named_pipe.test rename to 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 similarity index 100% rename from mysql-test/t/auth_rpl-slave.opt rename to mysql-test/main/auth_rpl-slave.opt diff --git a/mysql-test/r/auth_rpl.result b/mysql-test/main/auth_rpl.result similarity index 100% rename from mysql-test/r/auth_rpl.result rename to mysql-test/main/auth_rpl.result diff --git a/mysql-test/t/auth_rpl.test b/mysql-test/main/auth_rpl.test similarity index 100% rename from mysql-test/t/auth_rpl.test rename to mysql-test/main/auth_rpl.test diff --git a/mysql-test/r/auto_increment.result b/mysql-test/main/auto_increment.result similarity index 100% rename from mysql-test/r/auto_increment.result rename to mysql-test/main/auto_increment.result diff --git a/mysql-test/t/auto_increment.test b/mysql-test/main/auto_increment.test similarity index 100% rename from mysql-test/t/auto_increment.test rename to mysql-test/main/auto_increment.test diff --git a/mysql-test/t/auto_increment_ranges.inc b/mysql-test/main/auto_increment_ranges.inc similarity index 100% rename from mysql-test/t/auto_increment_ranges.inc rename to 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 similarity index 100% rename from mysql-test/r/auto_increment_ranges_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/auto_increment_ranges_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/auto_increment_ranges_myisam.result rename to 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 similarity index 100% rename from mysql-test/t/auto_increment_ranges_myisam.test rename to 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 similarity index 100% rename from mysql-test/r/bad_frm_crash_5029.result rename to 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 similarity index 100% rename from mysql-test/t/bad_frm_crash_5029.test rename to 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 similarity index 100% rename from mysql-test/r/bench_count_distinct.result rename to 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 similarity index 100% rename from mysql-test/t/bench_count_distinct.test rename to mysql-test/main/bench_count_distinct.test diff --git a/mysql-test/r/bigint.result b/mysql-test/main/bigint.result similarity index 100% rename from mysql-test/r/bigint.result rename to mysql-test/main/bigint.result diff --git a/mysql-test/t/bigint.test b/mysql-test/main/bigint.test similarity index 100% rename from mysql-test/t/bigint.test rename to mysql-test/main/bigint.test diff --git a/mysql-test/r/binary.result b/mysql-test/main/binary.result similarity index 100% rename from mysql-test/r/binary.result rename to mysql-test/main/binary.result diff --git a/mysql-test/t/binary.test b/mysql-test/main/binary.test similarity index 100% rename from mysql-test/t/binary.test rename to mysql-test/main/binary.test diff --git a/mysql-test/r/binary_to_hex.result b/mysql-test/main/binary_to_hex.result similarity index 100% rename from mysql-test/r/binary_to_hex.result rename to 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 similarity index 100% rename from mysql-test/t/binary_to_hex.test rename to mysql-test/main/binary_to_hex.test diff --git a/mysql-test/r/blackhole.result b/mysql-test/main/blackhole.result similarity index 100% rename from mysql-test/r/blackhole.result rename to mysql-test/main/blackhole.result diff --git a/mysql-test/t/blackhole.test b/mysql-test/main/blackhole.test similarity index 100% rename from mysql-test/t/blackhole.test rename to mysql-test/main/blackhole.test diff --git a/mysql-test/r/blackhole_plugin.result b/mysql-test/main/blackhole_plugin.result similarity index 100% rename from mysql-test/r/blackhole_plugin.result rename to mysql-test/main/blackhole_plugin.result diff --git a/mysql-test/t/blackhole_plugin.test b/mysql-test/main/blackhole_plugin.test similarity index 100% rename from mysql-test/t/blackhole_plugin.test rename to mysql-test/main/blackhole_plugin.test diff --git a/mysql-test/r/bool.result b/mysql-test/main/bool.result similarity index 100% rename from mysql-test/r/bool.result rename to mysql-test/main/bool.result diff --git a/mysql-test/t/bool.test b/mysql-test/main/bool.test similarity index 100% rename from mysql-test/t/bool.test rename to mysql-test/main/bool.test diff --git a/mysql-test/t/bootstrap-master.opt b/mysql-test/main/bootstrap-master.opt similarity index 100% rename from mysql-test/t/bootstrap-master.opt rename to mysql-test/main/bootstrap-master.opt diff --git a/mysql-test/r/bootstrap.result b/mysql-test/main/bootstrap.result similarity index 100% rename from mysql-test/r/bootstrap.result rename to mysql-test/main/bootstrap.result diff --git a/mysql-test/t/bootstrap.test b/mysql-test/main/bootstrap.test similarity index 100% rename from mysql-test/t/bootstrap.test rename to mysql-test/main/bootstrap.test diff --git a/mysql-test/r/bug12427262.result b/mysql-test/main/bug12427262.result similarity index 100% rename from mysql-test/r/bug12427262.result rename to mysql-test/main/bug12427262.result diff --git a/mysql-test/t/bug12427262.test b/mysql-test/main/bug12427262.test similarity index 100% rename from mysql-test/t/bug12427262.test rename to mysql-test/main/bug12427262.test diff --git a/mysql-test/r/bug13633383.result b/mysql-test/main/bug13633383.result similarity index 100% rename from mysql-test/r/bug13633383.result rename to mysql-test/main/bug13633383.result diff --git a/mysql-test/t/bug13633383.test b/mysql-test/main/bug13633383.test similarity index 100% rename from mysql-test/t/bug13633383.test rename to mysql-test/main/bug13633383.test diff --git a/mysql-test/r/bug39022.result b/mysql-test/main/bug39022.result similarity index 100% rename from mysql-test/r/bug39022.result rename to mysql-test/main/bug39022.result diff --git a/mysql-test/t/bug39022.test b/mysql-test/main/bug39022.test similarity index 100% rename from mysql-test/t/bug39022.test rename to mysql-test/main/bug39022.test diff --git a/mysql-test/t/bug46760-master.opt b/mysql-test/main/bug46760-master.opt similarity index 100% rename from mysql-test/t/bug46760-master.opt rename to mysql-test/main/bug46760-master.opt diff --git a/mysql-test/r/bug46760.result b/mysql-test/main/bug46760.result similarity index 100% rename from mysql-test/r/bug46760.result rename to mysql-test/main/bug46760.result diff --git a/mysql-test/t/bug46760.test b/mysql-test/main/bug46760.test similarity index 100% rename from mysql-test/t/bug46760.test rename to mysql-test/main/bug46760.test diff --git a/mysql-test/t/bug47671-master.opt b/mysql-test/main/bug47671-master.opt similarity index 100% rename from mysql-test/t/bug47671-master.opt rename to mysql-test/main/bug47671-master.opt diff --git a/mysql-test/r/bug47671.result b/mysql-test/main/bug47671.result similarity index 100% rename from mysql-test/r/bug47671.result rename to mysql-test/main/bug47671.result diff --git a/mysql-test/t/bug47671.test b/mysql-test/main/bug47671.test similarity index 100% rename from mysql-test/t/bug47671.test rename to mysql-test/main/bug47671.test diff --git a/mysql-test/t/bug58669-master.opt b/mysql-test/main/bug58669-master.opt similarity index 100% rename from mysql-test/t/bug58669-master.opt rename to mysql-test/main/bug58669-master.opt diff --git a/mysql-test/r/bug58669.result b/mysql-test/main/bug58669.result similarity index 100% rename from mysql-test/r/bug58669.result rename to mysql-test/main/bug58669.result diff --git a/mysql-test/t/bug58669.test b/mysql-test/main/bug58669.test similarity index 100% rename from mysql-test/t/bug58669.test rename to mysql-test/main/bug58669.test diff --git a/mysql-test/r/bulk_replace.result b/mysql-test/main/bulk_replace.result similarity index 100% rename from mysql-test/r/bulk_replace.result rename to mysql-test/main/bulk_replace.result diff --git a/mysql-test/t/bulk_replace.test b/mysql-test/main/bulk_replace.test similarity index 100% rename from mysql-test/t/bulk_replace.test rename to mysql-test/main/bulk_replace.test diff --git a/mysql-test/r/cache_innodb.result b/mysql-test/main/cache_innodb.result similarity index 100% rename from mysql-test/r/cache_innodb.result rename to mysql-test/main/cache_innodb.result diff --git a/mysql-test/t/cache_innodb.test b/mysql-test/main/cache_innodb.test similarity index 100% rename from mysql-test/t/cache_innodb.test rename to mysql-test/main/cache_innodb.test diff --git a/mysql-test/r/cache_temporal_4265.result b/mysql-test/main/cache_temporal_4265.result similarity index 100% rename from mysql-test/r/cache_temporal_4265.result rename to 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 similarity index 100% rename from mysql-test/t/cache_temporal_4265.test rename to mysql-test/main/cache_temporal_4265.test diff --git a/mysql-test/r/case.result b/mysql-test/main/case.result similarity index 100% rename from mysql-test/r/case.result rename to mysql-test/main/case.result diff --git a/mysql-test/t/case.test b/mysql-test/main/case.test similarity index 100% rename from mysql-test/t/case.test rename to mysql-test/main/case.test diff --git a/mysql-test/r/cast.result b/mysql-test/main/cast.result similarity index 100% rename from mysql-test/r/cast.result rename to mysql-test/main/cast.result diff --git a/mysql-test/t/cast.test b/mysql-test/main/cast.test similarity index 100% rename from mysql-test/t/cast.test rename to mysql-test/main/cast.test diff --git a/mysql-test/r/change_user.result b/mysql-test/main/change_user.result similarity index 100% rename from mysql-test/r/change_user.result rename to mysql-test/main/change_user.result diff --git a/mysql-test/t/change_user.test b/mysql-test/main/change_user.test similarity index 100% rename from mysql-test/t/change_user.test rename to mysql-test/main/change_user.test diff --git a/mysql-test/r/change_user_notembedded.result b/mysql-test/main/change_user_notembedded.result similarity index 100% rename from mysql-test/r/change_user_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/change_user_notembedded.test rename to mysql-test/main/change_user_notembedded.test diff --git a/mysql-test/r/check.result b/mysql-test/main/check.result similarity index 100% rename from mysql-test/r/check.result rename to mysql-test/main/check.result diff --git a/mysql-test/t/check.test b/mysql-test/main/check.test similarity index 100% rename from mysql-test/t/check.test rename to mysql-test/main/check.test diff --git a/mysql-test/r/check_constraint.result b/mysql-test/main/check_constraint.result similarity index 100% rename from mysql-test/r/check_constraint.result rename to mysql-test/main/check_constraint.result diff --git a/mysql-test/t/check_constraint.test b/mysql-test/main/check_constraint.test similarity index 100% rename from mysql-test/t/check_constraint.test rename to mysql-test/main/check_constraint.test diff --git a/mysql-test/r/check_constraint_show.result b/mysql-test/main/check_constraint_show.result similarity index 100% rename from mysql-test/r/check_constraint_show.result rename to 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 similarity index 100% rename from mysql-test/t/check_constraint_show.test rename to mysql-test/main/check_constraint_show.test diff --git a/mysql-test/r/client_xml.result b/mysql-test/main/client_xml.result similarity index 100% rename from mysql-test/r/client_xml.result rename to mysql-test/main/client_xml.result diff --git a/mysql-test/t/client_xml.test b/mysql-test/main/client_xml.test similarity index 100% rename from mysql-test/t/client_xml.test rename to mysql-test/main/client_xml.test diff --git a/mysql-test/t/column_compression.inc b/mysql-test/main/column_compression.inc similarity index 100% rename from mysql-test/t/column_compression.inc rename to mysql-test/main/column_compression.inc diff --git a/mysql-test/r/column_compression.result b/mysql-test/main/column_compression.result similarity index 100% rename from mysql-test/r/column_compression.result rename to mysql-test/main/column_compression.result diff --git a/mysql-test/t/column_compression.test b/mysql-test/main/column_compression.test similarity index 100% rename from mysql-test/t/column_compression.test rename to mysql-test/main/column_compression.test diff --git a/mysql-test/r/column_compression_parts.result b/mysql-test/main/column_compression_parts.result similarity index 100% rename from mysql-test/r/column_compression_parts.result rename to 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 similarity index 100% rename from mysql-test/t/column_compression_parts.test rename to 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 similarity index 100% rename from mysql-test/r/column_compression_rpl.result rename to 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 similarity index 100% rename from mysql-test/t/column_compression_rpl.test rename to mysql-test/main/column_compression_rpl.test diff --git a/mysql-test/r/comment_column.result b/mysql-test/main/comment_column.result similarity index 100% rename from mysql-test/r/comment_column.result rename to mysql-test/main/comment_column.result diff --git a/mysql-test/t/comment_column.test b/mysql-test/main/comment_column.test similarity index 100% rename from mysql-test/t/comment_column.test rename to mysql-test/main/comment_column.test diff --git a/mysql-test/r/comment_column2.result b/mysql-test/main/comment_column2.result similarity index 100% rename from mysql-test/r/comment_column2.result rename to mysql-test/main/comment_column2.result diff --git a/mysql-test/t/comment_column2.test b/mysql-test/main/comment_column2.test similarity index 100% rename from mysql-test/t/comment_column2.test rename to mysql-test/main/comment_column2.test diff --git a/mysql-test/r/comment_index.result b/mysql-test/main/comment_index.result similarity index 100% rename from mysql-test/r/comment_index.result rename to mysql-test/main/comment_index.result diff --git a/mysql-test/t/comment_index.test b/mysql-test/main/comment_index.test similarity index 100% rename from mysql-test/t/comment_index.test rename to mysql-test/main/comment_index.test diff --git a/mysql-test/r/comment_table.result b/mysql-test/main/comment_table.result similarity index 100% rename from mysql-test/r/comment_table.result rename to mysql-test/main/comment_table.result diff --git a/mysql-test/t/comment_table.test b/mysql-test/main/comment_table.test similarity index 100% rename from mysql-test/t/comment_table.test rename to mysql-test/main/comment_table.test diff --git a/mysql-test/r/comments.result b/mysql-test/main/comments.result similarity index 100% rename from mysql-test/r/comments.result rename to mysql-test/main/comments.result diff --git a/mysql-test/t/comments.test b/mysql-test/main/comments.test similarity index 100% rename from mysql-test/t/comments.test rename to mysql-test/main/comments.test diff --git a/mysql-test/r/commit.result b/mysql-test/main/commit.result similarity index 100% rename from mysql-test/r/commit.result rename to mysql-test/main/commit.result diff --git a/mysql-test/t/commit.test b/mysql-test/main/commit.test similarity index 100% rename from mysql-test/t/commit.test rename to mysql-test/main/commit.test diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/main/commit_1innodb.result similarity index 100% rename from mysql-test/r/commit_1innodb.result rename to mysql-test/main/commit_1innodb.result diff --git a/mysql-test/t/commit_1innodb.test b/mysql-test/main/commit_1innodb.test similarity index 100% rename from mysql-test/t/commit_1innodb.test rename to mysql-test/main/commit_1innodb.test diff --git a/mysql-test/r/compare.result b/mysql-test/main/compare.result similarity index 100% rename from mysql-test/r/compare.result rename to mysql-test/main/compare.result diff --git a/mysql-test/t/compare.test b/mysql-test/main/compare.test similarity index 100% rename from mysql-test/t/compare.test rename to mysql-test/main/compare.test diff --git a/mysql-test/r/compound.result b/mysql-test/main/compound.result similarity index 100% rename from mysql-test/r/compound.result rename to mysql-test/main/compound.result diff --git a/mysql-test/t/compound.test b/mysql-test/main/compound.test similarity index 100% rename from mysql-test/t/compound.test rename to mysql-test/main/compound.test diff --git a/mysql-test/r/compress.result b/mysql-test/main/compress.result similarity index 100% rename from mysql-test/r/compress.result rename to mysql-test/main/compress.result diff --git a/mysql-test/t/compress.test b/mysql-test/main/compress.test similarity index 100% rename from mysql-test/t/compress.test rename to 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 similarity index 100% rename from mysql-test/t/concurrent_innodb_safelog-master.opt rename to 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 similarity index 100% rename from mysql-test/r/concurrent_innodb_safelog.result rename to 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 similarity index 100% rename from mysql-test/t/concurrent_innodb_safelog.test rename to 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 similarity index 100% rename from mysql-test/t/concurrent_innodb_unsafelog-master.opt rename to 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 similarity index 100% rename from mysql-test/r/concurrent_innodb_unsafelog.result rename to 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 similarity index 100% rename from mysql-test/t/concurrent_innodb_unsafelog.test rename to mysql-test/main/concurrent_innodb_unsafelog.test diff --git a/mysql-test/t/connect.cnf b/mysql-test/main/connect.cnf similarity index 100% rename from mysql-test/t/connect.cnf rename to mysql-test/main/connect.cnf diff --git a/mysql-test/r/connect.result b/mysql-test/main/connect.result similarity index 100% rename from mysql-test/r/connect.result rename to mysql-test/main/connect.result diff --git a/mysql-test/t/connect.test b/mysql-test/main/connect.test similarity index 100% rename from mysql-test/t/connect.test rename to mysql-test/main/connect.test diff --git a/mysql-test/t/connect2.cnf b/mysql-test/main/connect2.cnf similarity index 100% rename from mysql-test/t/connect2.cnf rename to mysql-test/main/connect2.cnf diff --git a/mysql-test/r/connect2.result b/mysql-test/main/connect2.result similarity index 100% rename from mysql-test/r/connect2.result rename to mysql-test/main/connect2.result diff --git a/mysql-test/t/connect2.test b/mysql-test/main/connect2.test similarity index 100% rename from mysql-test/t/connect2.test rename to mysql-test/main/connect2.test diff --git a/mysql-test/r/consistent_snapshot.result b/mysql-test/main/consistent_snapshot.result similarity index 100% rename from mysql-test/r/consistent_snapshot.result rename to mysql-test/main/consistent_snapshot.result diff --git a/mysql-test/t/consistent_snapshot.test b/mysql-test/main/consistent_snapshot.test similarity index 100% rename from mysql-test/t/consistent_snapshot.test rename to mysql-test/main/consistent_snapshot.test diff --git a/mysql-test/r/constraints.result b/mysql-test/main/constraints.result similarity index 100% rename from mysql-test/r/constraints.result rename to mysql-test/main/constraints.result diff --git a/mysql-test/t/constraints.test b/mysql-test/main/constraints.test similarity index 100% rename from mysql-test/t/constraints.test rename to mysql-test/main/constraints.test diff --git a/mysql-test/r/contributors.result b/mysql-test/main/contributors.result similarity index 100% rename from mysql-test/r/contributors.result rename to mysql-test/main/contributors.result diff --git a/mysql-test/t/contributors.test b/mysql-test/main/contributors.test similarity index 100% rename from mysql-test/t/contributors.test rename to mysql-test/main/contributors.test diff --git a/mysql-test/r/count_distinct.result b/mysql-test/main/count_distinct.result similarity index 100% rename from mysql-test/r/count_distinct.result rename to mysql-test/main/count_distinct.result diff --git a/mysql-test/t/count_distinct.test b/mysql-test/main/count_distinct.test similarity index 100% rename from mysql-test/t/count_distinct.test rename to mysql-test/main/count_distinct.test diff --git a/mysql-test/t/count_distinct2-master.opt b/mysql-test/main/count_distinct2-master.opt similarity index 100% rename from mysql-test/t/count_distinct2-master.opt rename to mysql-test/main/count_distinct2-master.opt diff --git a/mysql-test/r/count_distinct2.result b/mysql-test/main/count_distinct2.result similarity index 100% rename from mysql-test/r/count_distinct2.result rename to mysql-test/main/count_distinct2.result diff --git a/mysql-test/t/count_distinct2.test b/mysql-test/main/count_distinct2.test similarity index 100% rename from mysql-test/t/count_distinct2.test rename to mysql-test/main/count_distinct2.test diff --git a/mysql-test/r/count_distinct3.result b/mysql-test/main/count_distinct3.result similarity index 100% rename from mysql-test/r/count_distinct3.result rename to mysql-test/main/count_distinct3.result diff --git a/mysql-test/t/count_distinct3.test b/mysql-test/main/count_distinct3.test similarity index 100% rename from mysql-test/t/count_distinct3.test rename to 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 similarity index 100% rename from mysql-test/t/crash_commit_before-master.opt rename to 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 similarity index 100% rename from mysql-test/r/crash_commit_before.result rename to 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 similarity index 100% rename from mysql-test/t/crash_commit_before.test rename to mysql-test/main/crash_commit_before.test diff --git a/mysql-test/r/create-big.result b/mysql-test/main/create-big.result similarity index 100% rename from mysql-test/r/create-big.result rename to mysql-test/main/create-big.result diff --git a/mysql-test/t/create-big.test b/mysql-test/main/create-big.test similarity index 100% rename from mysql-test/t/create-big.test rename to mysql-test/main/create-big.test diff --git a/mysql-test/r/create-uca.result b/mysql-test/main/create-uca.result similarity index 100% rename from mysql-test/r/create-uca.result rename to mysql-test/main/create-uca.result diff --git a/mysql-test/t/create-uca.test b/mysql-test/main/create-uca.test similarity index 100% rename from mysql-test/t/create-uca.test rename to mysql-test/main/create-uca.test diff --git a/mysql-test/r/create.result b/mysql-test/main/create.result similarity index 100% rename from mysql-test/r/create.result rename to mysql-test/main/create.result diff --git a/mysql-test/t/create.test b/mysql-test/main/create.test similarity index 100% rename from mysql-test/t/create.test rename to mysql-test/main/create.test diff --git a/mysql-test/r/create_delayed.result b/mysql-test/main/create_delayed.result similarity index 100% rename from mysql-test/r/create_delayed.result rename to mysql-test/main/create_delayed.result diff --git a/mysql-test/t/create_delayed.test b/mysql-test/main/create_delayed.test similarity index 100% rename from mysql-test/t/create_delayed.test rename to mysql-test/main/create_delayed.test diff --git a/mysql-test/r/create_drop_binlog.result b/mysql-test/main/create_drop_binlog.result similarity index 100% rename from mysql-test/r/create_drop_binlog.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_binlog.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_db.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_db.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_event.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_event.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_function.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_function.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_index.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_index.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_procedure.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_procedure.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_role.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_role.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_server.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_server.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_trigger.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_trigger.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_udf.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_udf.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_user.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_user.test rename to 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 similarity index 100% rename from mysql-test/r/create_drop_view.result rename to 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 similarity index 100% rename from mysql-test/t/create_drop_view.test rename to 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 similarity index 100% rename from mysql-test/r/create_not_windows.result rename to 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 similarity index 100% rename from mysql-test/t/create_not_windows.test rename to 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 similarity index 100% rename from mysql-test/t/create_or_replace-master.opt rename to 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 similarity index 100% rename from mysql-test/r/create_or_replace.result rename to 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 similarity index 100% rename from mysql-test/t/create_or_replace.test rename to 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 similarity index 100% rename from mysql-test/r/create_or_replace2.result rename to 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 similarity index 100% rename from mysql-test/t/create_or_replace2.test rename to 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 similarity index 100% rename from mysql-test/r/create_or_replace_permission.result rename to 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 similarity index 100% rename from mysql-test/t/create_or_replace_permission.test rename to 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 similarity index 100% rename from mysql-test/r/create_select_tmp.result rename to 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 similarity index 100% rename from mysql-test/t/create_select_tmp.test rename to mysql-test/main/create_select_tmp.test diff --git a/mysql-test/r/create_user.result b/mysql-test/main/create_user.result similarity index 100% rename from mysql-test/r/create_user.result rename to mysql-test/main/create_user.result diff --git a/mysql-test/t/create_user.test b/mysql-test/main/create_user.test similarity index 100% rename from mysql-test/t/create_user.test rename to 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 similarity index 100% rename from mysql-test/r/create_w_max_indexes_128.result rename to 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 similarity index 100% rename from mysql-test/t/create_w_max_indexes_128.test rename to 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 similarity index 100% rename from mysql-test/r/create_w_max_indexes_64.result rename to 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 similarity index 100% rename from mysql-test/t/create_w_max_indexes_64.test rename to 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 similarity index 100% rename from mysql-test/r/cte_grant.result rename to mysql-test/main/cte_grant.result diff --git a/mysql-test/t/cte_grant.test b/mysql-test/main/cte_grant.test similarity index 100% rename from mysql-test/t/cte_grant.test rename to mysql-test/main/cte_grant.test diff --git a/mysql-test/r/cte_nonrecursive.result b/mysql-test/main/cte_nonrecursive.result similarity index 100% rename from mysql-test/r/cte_nonrecursive.result rename to mysql-test/main/cte_nonrecursive.result diff --git a/mysql-test/t/cte_nonrecursive.test b/mysql-test/main/cte_nonrecursive.test similarity index 100% rename from mysql-test/t/cte_nonrecursive.test rename to mysql-test/main/cte_nonrecursive.test diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/main/cte_recursive.result similarity index 100% rename from mysql-test/r/cte_recursive.result rename to mysql-test/main/cte_recursive.result diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/main/cte_recursive.test similarity index 100% rename from mysql-test/t/cte_recursive.test rename to mysql-test/main/cte_recursive.test diff --git a/mysql-test/r/ctype_ascii.result b/mysql-test/main/ctype_ascii.result similarity index 100% rename from mysql-test/r/ctype_ascii.result rename to mysql-test/main/ctype_ascii.result diff --git a/mysql-test/t/ctype_ascii.test b/mysql-test/main/ctype_ascii.test similarity index 100% rename from mysql-test/t/ctype_ascii.test rename to mysql-test/main/ctype_ascii.test diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/main/ctype_big5.result similarity index 100% rename from mysql-test/r/ctype_big5.result rename to mysql-test/main/ctype_big5.result diff --git a/mysql-test/t/ctype_big5.test b/mysql-test/main/ctype_big5.test similarity index 100% rename from mysql-test/t/ctype_big5.test rename to mysql-test/main/ctype_big5.test diff --git a/mysql-test/r/ctype_binary.result b/mysql-test/main/ctype_binary.result similarity index 100% rename from mysql-test/r/ctype_binary.result rename to mysql-test/main/ctype_binary.result diff --git a/mysql-test/t/ctype_binary.test b/mysql-test/main/ctype_binary.test similarity index 100% rename from mysql-test/t/ctype_binary.test rename to mysql-test/main/ctype_binary.test diff --git a/mysql-test/r/ctype_collate.result b/mysql-test/main/ctype_collate.result similarity index 100% rename from mysql-test/r/ctype_collate.result rename to mysql-test/main/ctype_collate.result diff --git a/mysql-test/t/ctype_collate.test b/mysql-test/main/ctype_collate.test similarity index 100% rename from mysql-test/t/ctype_collate.test rename to mysql-test/main/ctype_collate.test diff --git a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/main/ctype_cp1250_ch.result similarity index 100% rename from mysql-test/r/ctype_cp1250_ch.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_cp1250_ch.test rename to mysql-test/main/ctype_cp1250_ch.test diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result similarity index 100% rename from mysql-test/r/ctype_cp1251.result rename to mysql-test/main/ctype_cp1251.result diff --git a/mysql-test/t/ctype_cp1251.test b/mysql-test/main/ctype_cp1251.test similarity index 100% rename from mysql-test/t/ctype_cp1251.test rename to mysql-test/main/ctype_cp1251.test diff --git a/mysql-test/r/ctype_cp850.result b/mysql-test/main/ctype_cp850.result similarity index 100% rename from mysql-test/r/ctype_cp850.result rename to mysql-test/main/ctype_cp850.result diff --git a/mysql-test/t/ctype_cp850.test b/mysql-test/main/ctype_cp850.test similarity index 100% rename from mysql-test/t/ctype_cp850.test rename to mysql-test/main/ctype_cp850.test diff --git a/mysql-test/r/ctype_cp932.result b/mysql-test/main/ctype_cp932.result similarity index 100% rename from mysql-test/r/ctype_cp932.result rename to mysql-test/main/ctype_cp932.result diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/main/ctype_cp932.test similarity index 100% rename from mysql-test/t/ctype_cp932.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_cp932_binlog_row.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_cp932_binlog_row.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_cp932_binlog_stm.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_cp932_binlog_stm.test rename to mysql-test/main/ctype_cp932_binlog_stm.test diff --git a/mysql-test/r/ctype_create.result b/mysql-test/main/ctype_create.result similarity index 100% rename from mysql-test/r/ctype_create.result rename to mysql-test/main/ctype_create.result diff --git a/mysql-test/t/ctype_create.test b/mysql-test/main/ctype_create.test similarity index 100% rename from mysql-test/t/ctype_create.test rename to mysql-test/main/ctype_create.test diff --git a/mysql-test/r/ctype_errors.result b/mysql-test/main/ctype_errors.result similarity index 100% rename from mysql-test/r/ctype_errors.result rename to mysql-test/main/ctype_errors.result diff --git a/mysql-test/t/ctype_errors.test b/mysql-test/main/ctype_errors.test similarity index 100% rename from mysql-test/t/ctype_errors.test rename to mysql-test/main/ctype_errors.test diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result similarity index 100% rename from mysql-test/r/ctype_eucjpms.result rename to mysql-test/main/ctype_eucjpms.result diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/main/ctype_eucjpms.test similarity index 100% rename from mysql-test/t/ctype_eucjpms.test rename to mysql-test/main/ctype_eucjpms.test diff --git a/mysql-test/r/ctype_euckr.result b/mysql-test/main/ctype_euckr.result similarity index 100% rename from mysql-test/r/ctype_euckr.result rename to mysql-test/main/ctype_euckr.result diff --git a/mysql-test/t/ctype_euckr.test b/mysql-test/main/ctype_euckr.test similarity index 100% rename from mysql-test/t/ctype_euckr.test rename to mysql-test/main/ctype_euckr.test diff --git a/mysql-test/r/ctype_filename.result b/mysql-test/main/ctype_filename.result similarity index 100% rename from mysql-test/r/ctype_filename.result rename to mysql-test/main/ctype_filename.result diff --git a/mysql-test/t/ctype_filename.test b/mysql-test/main/ctype_filename.test similarity index 100% rename from mysql-test/t/ctype_filename.test rename to mysql-test/main/ctype_filename.test diff --git a/mysql-test/t/ctype_filesystem-master.opt b/mysql-test/main/ctype_filesystem-master.opt similarity index 100% rename from mysql-test/t/ctype_filesystem-master.opt rename to mysql-test/main/ctype_filesystem-master.opt diff --git a/mysql-test/r/ctype_filesystem.result b/mysql-test/main/ctype_filesystem.result similarity index 100% rename from mysql-test/r/ctype_filesystem.result rename to mysql-test/main/ctype_filesystem.result diff --git a/mysql-test/t/ctype_filesystem.test b/mysql-test/main/ctype_filesystem.test similarity index 100% rename from mysql-test/t/ctype_filesystem.test rename to mysql-test/main/ctype_filesystem.test diff --git a/mysql-test/r/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result similarity index 100% rename from mysql-test/r/ctype_gb2312.result rename to mysql-test/main/ctype_gb2312.result diff --git a/mysql-test/t/ctype_gb2312.test b/mysql-test/main/ctype_gb2312.test similarity index 100% rename from mysql-test/t/ctype_gb2312.test rename to mysql-test/main/ctype_gb2312.test diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/main/ctype_gbk.result similarity index 100% rename from mysql-test/r/ctype_gbk.result rename to mysql-test/main/ctype_gbk.result diff --git a/mysql-test/t/ctype_gbk.test b/mysql-test/main/ctype_gbk.test similarity index 100% rename from mysql-test/t/ctype_gbk.test rename to mysql-test/main/ctype_gbk.test diff --git a/mysql-test/r/ctype_gbk_binlog.result b/mysql-test/main/ctype_gbk_binlog.result similarity index 100% rename from mysql-test/r/ctype_gbk_binlog.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_gbk_binlog.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_gbk_export_import.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_gbk_export_import.test rename to mysql-test/main/ctype_gbk_export_import.test diff --git a/mysql-test/r/ctype_hebrew.result b/mysql-test/main/ctype_hebrew.result similarity index 100% rename from mysql-test/r/ctype_hebrew.result rename to mysql-test/main/ctype_hebrew.result diff --git a/mysql-test/t/ctype_hebrew.test b/mysql-test/main/ctype_hebrew.test similarity index 100% rename from mysql-test/t/ctype_hebrew.test rename to mysql-test/main/ctype_hebrew.test diff --git a/mysql-test/r/ctype_latin1.result b/mysql-test/main/ctype_latin1.result similarity index 100% rename from mysql-test/r/ctype_latin1.result rename to mysql-test/main/ctype_latin1.result diff --git a/mysql-test/t/ctype_latin1.test b/mysql-test/main/ctype_latin1.test similarity index 100% rename from mysql-test/t/ctype_latin1.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_latin1_de-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ctype_latin1_de.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_latin1_de.test rename to mysql-test/main/ctype_latin1_de.test diff --git a/mysql-test/r/ctype_latin2.result b/mysql-test/main/ctype_latin2.result similarity index 100% rename from mysql-test/r/ctype_latin2.result rename to mysql-test/main/ctype_latin2.result diff --git a/mysql-test/t/ctype_latin2.test b/mysql-test/main/ctype_latin2.test similarity index 100% rename from mysql-test/t/ctype_latin2.test rename to mysql-test/main/ctype_latin2.test diff --git a/mysql-test/r/ctype_latin2_ch.result b/mysql-test/main/ctype_latin2_ch.result similarity index 100% rename from mysql-test/r/ctype_latin2_ch.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_latin2_ch.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_ldml-master.opt rename to mysql-test/main/ctype_ldml-master.opt diff --git a/mysql-test/r/ctype_ldml.result b/mysql-test/main/ctype_ldml.result similarity index 100% rename from mysql-test/r/ctype_ldml.result rename to mysql-test/main/ctype_ldml.result diff --git a/mysql-test/t/ctype_ldml.test b/mysql-test/main/ctype_ldml.test similarity index 100% rename from mysql-test/t/ctype_ldml.test rename to mysql-test/main/ctype_ldml.test diff --git a/mysql-test/r/ctype_like_range.result b/mysql-test/main/ctype_like_range.result similarity index 100% rename from mysql-test/r/ctype_like_range.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_like_range.test rename to mysql-test/main/ctype_like_range.test diff --git a/mysql-test/r/ctype_many.result b/mysql-test/main/ctype_many.result similarity index 100% rename from mysql-test/r/ctype_many.result rename to mysql-test/main/ctype_many.result diff --git a/mysql-test/t/ctype_many.test b/mysql-test/main/ctype_many.test similarity index 100% rename from mysql-test/t/ctype_many.test rename to mysql-test/main/ctype_many.test diff --git a/mysql-test/r/ctype_mb.result b/mysql-test/main/ctype_mb.result similarity index 100% rename from mysql-test/r/ctype_mb.result rename to mysql-test/main/ctype_mb.result diff --git a/mysql-test/t/ctype_mb.test b/mysql-test/main/ctype_mb.test similarity index 100% rename from mysql-test/t/ctype_mb.test rename to mysql-test/main/ctype_mb.test diff --git a/mysql-test/r/ctype_nopad_8bit.result b/mysql-test/main/ctype_nopad_8bit.result similarity index 100% rename from mysql-test/r/ctype_nopad_8bit.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_nopad_8bit.test rename to mysql-test/main/ctype_nopad_8bit.test diff --git a/mysql-test/r/ctype_partitions.result b/mysql-test/main/ctype_partitions.result similarity index 100% rename from mysql-test/r/ctype_partitions.result rename to mysql-test/main/ctype_partitions.result diff --git a/mysql-test/t/ctype_partitions.test b/mysql-test/main/ctype_partitions.test similarity index 100% rename from mysql-test/t/ctype_partitions.test rename to mysql-test/main/ctype_partitions.test diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/main/ctype_recoding.result similarity index 100% rename from mysql-test/r/ctype_recoding.result rename to mysql-test/main/ctype_recoding.result diff --git a/mysql-test/t/ctype_recoding.test b/mysql-test/main/ctype_recoding.test similarity index 100% rename from mysql-test/t/ctype_recoding.test rename to mysql-test/main/ctype_recoding.test diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/main/ctype_sjis.result similarity index 100% rename from mysql-test/r/ctype_sjis.result rename to mysql-test/main/ctype_sjis.result diff --git a/mysql-test/t/ctype_sjis.test b/mysql-test/main/ctype_sjis.test similarity index 100% rename from mysql-test/t/ctype_sjis.test rename to mysql-test/main/ctype_sjis.test diff --git a/mysql-test/r/ctype_swe7.result b/mysql-test/main/ctype_swe7.result similarity index 100% rename from mysql-test/r/ctype_swe7.result rename to mysql-test/main/ctype_swe7.result diff --git a/mysql-test/t/ctype_swe7.test b/mysql-test/main/ctype_swe7.test similarity index 100% rename from mysql-test/t/ctype_swe7.test rename to mysql-test/main/ctype_swe7.test diff --git a/mysql-test/r/ctype_tis620.result b/mysql-test/main/ctype_tis620.result similarity index 100% rename from mysql-test/r/ctype_tis620.result rename to mysql-test/main/ctype_tis620.result diff --git a/mysql-test/t/ctype_tis620.test b/mysql-test/main/ctype_tis620.test similarity index 100% rename from mysql-test/t/ctype_tis620.test rename to mysql-test/main/ctype_tis620.test diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/main/ctype_uca.result similarity index 100% rename from mysql-test/r/ctype_uca.result rename to mysql-test/main/ctype_uca.result diff --git a/mysql-test/t/ctype_uca.test b/mysql-test/main/ctype_uca.test similarity index 100% rename from mysql-test/t/ctype_uca.test rename to mysql-test/main/ctype_uca.test diff --git a/mysql-test/r/ctype_uca_innodb.result b/mysql-test/main/ctype_uca_innodb.result similarity index 100% rename from mysql-test/r/ctype_uca_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_uca_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_uca_partitions.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_uca_partitions.test rename to mysql-test/main/ctype_uca_partitions.test diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/main/ctype_ucs.result similarity index 100% rename from mysql-test/r/ctype_ucs.result rename to mysql-test/main/ctype_ucs.result diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/main/ctype_ucs.test similarity index 100% rename from mysql-test/t/ctype_ucs.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_ucs2_def-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ctype_ucs2_def.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_ucs2_def.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_ucs2_query_cache-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ctype_ucs2_query_cache.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_ucs2_query_cache.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_ucs2_uca.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_ucs2_uca.test rename to mysql-test/main/ctype_ucs2_uca.test diff --git a/mysql-test/r/ctype_ujis.result b/mysql-test/main/ctype_ujis.result similarity index 100% rename from mysql-test/r/ctype_ujis.result rename to mysql-test/main/ctype_ujis.result diff --git a/mysql-test/t/ctype_ujis.test b/mysql-test/main/ctype_ujis.test similarity index 100% rename from mysql-test/t/ctype_ujis.test rename to mysql-test/main/ctype_ujis.test diff --git a/mysql-test/r/ctype_ujis_ucs2.result b/mysql-test/main/ctype_ujis_ucs2.result similarity index 100% rename from mysql-test/r/ctype_ujis_ucs2.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_ujis_ucs2.test rename to mysql-test/main/ctype_ujis_ucs2.test diff --git a/mysql-test/r/ctype_upgrade.result b/mysql-test/main/ctype_upgrade.result similarity index 100% rename from mysql-test/r/ctype_upgrade.result rename to mysql-test/main/ctype_upgrade.result diff --git a/mysql-test/t/ctype_upgrade.test b/mysql-test/main/ctype_upgrade.test similarity index 100% rename from mysql-test/t/ctype_upgrade.test rename to mysql-test/main/ctype_upgrade.test diff --git a/mysql-test/r/ctype_utf16.result b/mysql-test/main/ctype_utf16.result similarity index 100% rename from mysql-test/r/ctype_utf16.result rename to mysql-test/main/ctype_utf16.result diff --git a/mysql-test/t/ctype_utf16.test b/mysql-test/main/ctype_utf16.test similarity index 100% rename from mysql-test/t/ctype_utf16.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf16_def-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ctype_utf16_def.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf16_def.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_utf16_uca.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf16_uca.test rename to mysql-test/main/ctype_utf16_uca.test diff --git a/mysql-test/r/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result similarity index 100% rename from mysql-test/r/ctype_utf16le.result rename to mysql-test/main/ctype_utf16le.result diff --git a/mysql-test/t/ctype_utf16le.test b/mysql-test/main/ctype_utf16le.test similarity index 100% rename from mysql-test/t/ctype_utf16le.test rename to mysql-test/main/ctype_utf16le.test diff --git a/mysql-test/r/ctype_utf32.result b/mysql-test/main/ctype_utf32.result similarity index 100% rename from mysql-test/r/ctype_utf32.result rename to mysql-test/main/ctype_utf32.result diff --git a/mysql-test/t/ctype_utf32.test b/mysql-test/main/ctype_utf32.test similarity index 100% rename from mysql-test/t/ctype_utf32.test rename to mysql-test/main/ctype_utf32.test diff --git a/mysql-test/r/ctype_utf32_uca.result b/mysql-test/main/ctype_utf32_uca.result similarity index 100% rename from mysql-test/r/ctype_utf32_uca.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf32_uca.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8-master.opt rename to mysql-test/main/ctype_utf8-master.opt diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/main/ctype_utf8.result similarity index 100% rename from mysql-test/r/ctype_utf8.result rename to mysql-test/main/ctype_utf8.result diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/main/ctype_utf8.test similarity index 100% rename from mysql-test/t/ctype_utf8.test rename to mysql-test/main/ctype_utf8.test diff --git a/mysql-test/r/ctype_utf8_uca.result b/mysql-test/main/ctype_utf8_uca.result similarity index 100% rename from mysql-test/r/ctype_utf8_uca.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8_uca.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8mb4-master.opt rename to mysql-test/main/ctype_utf8mb4-master.opt diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result similarity index 100% rename from mysql-test/r/ctype_utf8mb4.result rename to mysql-test/main/ctype_utf8mb4.result diff --git a/mysql-test/t/ctype_utf8mb4.test b/mysql-test/main/ctype_utf8mb4.test similarity index 100% rename from mysql-test/t/ctype_utf8mb4.test rename to mysql-test/main/ctype_utf8mb4.test diff --git a/mysql-test/r/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result similarity index 100% rename from mysql-test/r/ctype_utf8mb4_heap.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8mb4_heap.test rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8mb4_innodb-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ctype_utf8mb4_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8mb4_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_utf8mb4_myisam.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8mb4_myisam.test rename to 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 similarity index 100% rename from mysql-test/r/ctype_utf8mb4_uca.result rename to 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 similarity index 100% rename from mysql-test/t/ctype_utf8mb4_uca.test rename to 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 similarity index 100% rename from mysql-test/r/custom_aggregate_functions.result rename to 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 similarity index 100% rename from mysql-test/t/custom_aggregate_functions.test rename to 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 similarity index 100% rename from mysql-test/t/date_formats-master.opt rename to mysql-test/main/date_formats-master.opt diff --git a/mysql-test/r/date_formats.result b/mysql-test/main/date_formats.result similarity index 100% rename from mysql-test/r/date_formats.result rename to mysql-test/main/date_formats.result diff --git a/mysql-test/t/date_formats.test b/mysql-test/main/date_formats.test similarity index 100% rename from mysql-test/t/date_formats.test rename to mysql-test/main/date_formats.test diff --git a/mysql-test/r/datetime_456.result b/mysql-test/main/datetime_456.result similarity index 100% rename from mysql-test/r/datetime_456.result rename to mysql-test/main/datetime_456.result diff --git a/mysql-test/t/datetime_456.test b/mysql-test/main/datetime_456.test similarity index 100% rename from mysql-test/t/datetime_456.test rename to mysql-test/main/datetime_456.test diff --git a/mysql-test/r/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result similarity index 100% rename from mysql-test/r/ddl_i18n_koi8r.result rename to 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 similarity index 100% rename from mysql-test/t/ddl_i18n_koi8r.test rename to 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 similarity index 100% rename from mysql-test/r/ddl_i18n_utf8.result rename to 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 similarity index 100% rename from mysql-test/t/ddl_i18n_utf8.test rename to mysql-test/main/ddl_i18n_utf8.test diff --git a/mysql-test/r/deadlock_innodb.result b/mysql-test/main/deadlock_innodb.result similarity index 100% rename from mysql-test/r/deadlock_innodb.result rename to mysql-test/main/deadlock_innodb.result diff --git a/mysql-test/t/deadlock_innodb.test b/mysql-test/main/deadlock_innodb.test similarity index 100% rename from mysql-test/t/deadlock_innodb.test rename to mysql-test/main/deadlock_innodb.test diff --git a/mysql-test/r/debug_sync.result b/mysql-test/main/debug_sync.result similarity index 100% rename from mysql-test/r/debug_sync.result rename to mysql-test/main/debug_sync.result diff --git a/mysql-test/t/debug_sync.test b/mysql-test/main/debug_sync.test similarity index 100% rename from mysql-test/t/debug_sync.test rename to mysql-test/main/debug_sync.test diff --git a/mysql-test/r/default.result b/mysql-test/main/default.result similarity index 100% rename from mysql-test/r/default.result rename to mysql-test/main/default.result diff --git a/mysql-test/t/default.test b/mysql-test/main/default.test similarity index 100% rename from mysql-test/t/default.test rename to mysql-test/main/default.test diff --git a/mysql-test/r/default_debug.result b/mysql-test/main/default_debug.result similarity index 100% rename from mysql-test/r/default_debug.result rename to mysql-test/main/default_debug.result diff --git a/mysql-test/t/default_debug.test b/mysql-test/main/default_debug.test similarity index 100% rename from mysql-test/t/default_debug.test rename to mysql-test/main/default_debug.test diff --git a/mysql-test/r/default_session.result b/mysql-test/main/default_session.result similarity index 100% rename from mysql-test/r/default_session.result rename to mysql-test/main/default_session.result diff --git a/mysql-test/t/default_session.test b/mysql-test/main/default_session.test similarity index 100% rename from mysql-test/t/default_session.test rename to mysql-test/main/default_session.test diff --git a/mysql-test/r/default_storage_engine.result b/mysql-test/main/default_storage_engine.result similarity index 100% rename from mysql-test/r/default_storage_engine.result rename to 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 similarity index 100% rename from mysql-test/t/default_storage_engine.test rename to mysql-test/main/default_storage_engine.test diff --git a/mysql-test/r/delayed.result b/mysql-test/main/delayed.result similarity index 100% rename from mysql-test/r/delayed.result rename to mysql-test/main/delayed.result diff --git a/mysql-test/t/delayed.test b/mysql-test/main/delayed.test similarity index 99% rename from mysql-test/t/delayed.test rename to 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 similarity index 100% rename from mysql-test/r/delete.result rename to mysql-test/main/delete.result diff --git a/mysql-test/t/delete.test b/mysql-test/main/delete.test similarity index 100% rename from mysql-test/t/delete.test rename to mysql-test/main/delete.test diff --git a/mysql-test/r/delete_returning.result b/mysql-test/main/delete_returning.result similarity index 100% rename from mysql-test/r/delete_returning.result rename to mysql-test/main/delete_returning.result diff --git a/mysql-test/t/delete_returning.test b/mysql-test/main/delete_returning.test similarity index 100% rename from mysql-test/t/delete_returning.test rename to mysql-test/main/delete_returning.test diff --git a/mysql-test/r/delete_returning_grant.result b/mysql-test/main/delete_returning_grant.result similarity index 100% rename from mysql-test/r/delete_returning_grant.result rename to 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 similarity index 100% rename from mysql-test/t/delete_returning_grant.test rename to 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 similarity index 100% rename from mysql-test/r/delete_use_source.result rename to 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 similarity index 100% rename from mysql-test/t/delete_use_source.test rename to 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 similarity index 100% rename from mysql-test/t/delimiter_case_mdev_10728.sql rename to 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 similarity index 100% rename from mysql-test/r/delimiter_command_case_sensitivity.result rename to 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 similarity index 100% rename from mysql-test/r/deprecated_features.result rename to mysql-test/main/deprecated_features.result diff --git a/mysql-test/t/deprecated_features.test b/mysql-test/main/deprecated_features.test similarity index 100% rename from mysql-test/t/deprecated_features.test rename to mysql-test/main/deprecated_features.test diff --git a/mysql-test/r/derived.result b/mysql-test/main/derived.result similarity index 100% rename from mysql-test/r/derived.result rename to mysql-test/main/derived.result diff --git a/mysql-test/t/derived.test b/mysql-test/main/derived.test similarity index 100% rename from mysql-test/t/derived.test rename to mysql-test/main/derived.test diff --git a/mysql-test/r/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result similarity index 100% rename from mysql-test/r/derived_cond_pushdown.result rename to 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 similarity index 100% rename from mysql-test/t/derived_cond_pushdown.test rename to mysql-test/main/derived_cond_pushdown.test diff --git a/mysql-test/r/derived_opt.result b/mysql-test/main/derived_opt.result similarity index 100% rename from mysql-test/r/derived_opt.result rename to mysql-test/main/derived_opt.result diff --git a/mysql-test/t/derived_opt.test b/mysql-test/main/derived_opt.test similarity index 100% rename from mysql-test/t/derived_opt.test rename to mysql-test/main/derived_opt.test diff --git a/mysql-test/r/derived_view.result b/mysql-test/main/derived_view.result similarity index 100% rename from mysql-test/r/derived_view.result rename to mysql-test/main/derived_view.result diff --git a/mysql-test/t/derived_view.test b/mysql-test/main/derived_view.test similarity index 100% rename from mysql-test/t/derived_view.test rename to mysql-test/main/derived_view.test diff --git a/mysql-test/r/dirty_close.result b/mysql-test/main/dirty_close.result similarity index 100% rename from mysql-test/r/dirty_close.result rename to mysql-test/main/dirty_close.result diff --git a/mysql-test/t/dirty_close.test b/mysql-test/main/dirty_close.test similarity index 100% rename from mysql-test/t/dirty_close.test rename to mysql-test/main/dirty_close.test diff --git a/mysql-test/disabled.def b/mysql-test/main/disabled.def similarity index 100% rename from mysql-test/disabled.def rename to mysql-test/main/disabled.def diff --git a/mysql-test/r/distinct.result b/mysql-test/main/distinct.result similarity index 100% rename from mysql-test/r/distinct.result rename to mysql-test/main/distinct.result diff --git a/mysql-test/t/distinct.test b/mysql-test/main/distinct.test similarity index 100% rename from mysql-test/t/distinct.test rename to mysql-test/main/distinct.test diff --git a/mysql-test/r/drop-no_root.result b/mysql-test/main/drop-no_root.result similarity index 100% rename from mysql-test/r/drop-no_root.result rename to 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 similarity index 100% rename from mysql-test/t/drop-no_root.test rename to mysql-test/main/drop-no_root.test diff --git a/mysql-test/r/drop.result b/mysql-test/main/drop.result similarity index 100% rename from mysql-test/r/drop.result rename to mysql-test/main/drop.result diff --git a/mysql-test/t/drop.test b/mysql-test/main/drop.test similarity index 100% rename from mysql-test/t/drop.test rename to 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 similarity index 100% rename from mysql-test/r/drop_bad_db_type.result rename to 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 similarity index 100% rename from mysql-test/t/drop_bad_db_type.test rename to mysql-test/main/drop_bad_db_type.test diff --git a/mysql-test/r/dyncol.result b/mysql-test/main/dyncol.result similarity index 100% rename from mysql-test/r/dyncol.result rename to mysql-test/main/dyncol.result diff --git a/mysql-test/t/dyncol.test b/mysql-test/main/dyncol.test similarity index 100% rename from mysql-test/t/dyncol.test rename to 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 similarity index 100% rename from mysql-test/r/empty_server_name-8224.result rename to 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 similarity index 100% rename from mysql-test/t/empty_server_name-8224.test rename to 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 similarity index 100% rename from mysql-test/r/empty_string_literal.result rename to 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 similarity index 100% rename from mysql-test/t/empty_string_literal.test rename to mysql-test/main/empty_string_literal.test diff --git a/mysql-test/r/empty_table.result b/mysql-test/main/empty_table.result similarity index 100% rename from mysql-test/r/empty_table.result rename to mysql-test/main/empty_table.result diff --git a/mysql-test/t/empty_table.test b/mysql-test/main/empty_table.test similarity index 100% rename from mysql-test/t/empty_table.test rename to mysql-test/main/empty_table.test diff --git a/mysql-test/r/empty_user_table.result b/mysql-test/main/empty_user_table.result similarity index 100% rename from mysql-test/r/empty_user_table.result rename to 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 similarity index 100% rename from mysql-test/t/empty_user_table.test rename to mysql-test/main/empty_user_table.test diff --git a/mysql-test/r/endspace.result b/mysql-test/main/endspace.result similarity index 100% rename from mysql-test/r/endspace.result rename to mysql-test/main/endspace.result diff --git a/mysql-test/t/endspace.test b/mysql-test/main/endspace.test similarity index 100% rename from mysql-test/t/endspace.test rename to mysql-test/main/endspace.test diff --git a/mysql-test/r/enforce_storage_engine.result b/mysql-test/main/enforce_storage_engine.result similarity index 100% rename from mysql-test/r/enforce_storage_engine.result rename to 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 similarity index 100% rename from mysql-test/t/enforce_storage_engine.test rename to 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 similarity index 100% rename from mysql-test/t/enforce_storage_engine_opt.opt rename to 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 similarity index 100% rename from mysql-test/r/enforce_storage_engine_opt.result rename to 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 similarity index 100% rename from mysql-test/t/enforce_storage_engine_opt.test rename to 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 similarity index 100% rename from mysql-test/r/engine_error_in_alter-8453.result rename to 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 similarity index 100% rename from mysql-test/t/engine_error_in_alter-8453.test rename to 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 similarity index 100% rename from mysql-test/t/error_simulation-master.opt rename to mysql-test/main/error_simulation-master.opt diff --git a/mysql-test/r/error_simulation.result b/mysql-test/main/error_simulation.result similarity index 100% rename from mysql-test/r/error_simulation.result rename to mysql-test/main/error_simulation.result diff --git a/mysql-test/t/error_simulation.test b/mysql-test/main/error_simulation.test similarity index 100% rename from mysql-test/t/error_simulation.test rename to mysql-test/main/error_simulation.test diff --git a/mysql-test/r/errors.result b/mysql-test/main/errors.result similarity index 100% rename from mysql-test/r/errors.result rename to mysql-test/main/errors.result diff --git a/mysql-test/t/errors.test b/mysql-test/main/errors.test similarity index 100% rename from mysql-test/t/errors.test rename to mysql-test/main/errors.test diff --git a/mysql-test/r/events_1.result b/mysql-test/main/events_1.result similarity index 100% rename from mysql-test/r/events_1.result rename to mysql-test/main/events_1.result diff --git a/mysql-test/t/events_1.test b/mysql-test/main/events_1.test similarity index 100% rename from mysql-test/t/events_1.test rename to mysql-test/main/events_1.test diff --git a/mysql-test/r/events_2.result b/mysql-test/main/events_2.result similarity index 100% rename from mysql-test/r/events_2.result rename to mysql-test/main/events_2.result diff --git a/mysql-test/t/events_2.test b/mysql-test/main/events_2.test similarity index 100% rename from mysql-test/t/events_2.test rename to mysql-test/main/events_2.test diff --git a/mysql-test/t/events_bugs-master.opt b/mysql-test/main/events_bugs-master.opt similarity index 100% rename from mysql-test/t/events_bugs-master.opt rename to mysql-test/main/events_bugs-master.opt diff --git a/mysql-test/r/events_bugs.result b/mysql-test/main/events_bugs.result similarity index 100% rename from mysql-test/r/events_bugs.result rename to mysql-test/main/events_bugs.result diff --git a/mysql-test/t/events_bugs.test b/mysql-test/main/events_bugs.test similarity index 100% rename from mysql-test/t/events_bugs.test rename to mysql-test/main/events_bugs.test diff --git a/mysql-test/r/events_embedded.result b/mysql-test/main/events_embedded.result similarity index 100% rename from mysql-test/r/events_embedded.result rename to mysql-test/main/events_embedded.result diff --git a/mysql-test/t/events_embedded.test b/mysql-test/main/events_embedded.test similarity index 100% rename from mysql-test/t/events_embedded.test rename to mysql-test/main/events_embedded.test diff --git a/mysql-test/r/events_grant.result b/mysql-test/main/events_grant.result similarity index 100% rename from mysql-test/r/events_grant.result rename to mysql-test/main/events_grant.result diff --git a/mysql-test/t/events_grant.test b/mysql-test/main/events_grant.test similarity index 100% rename from mysql-test/t/events_grant.test rename to 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 similarity index 100% rename from mysql-test/t/events_logs_tests-master.opt rename to 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 similarity index 100% rename from mysql-test/r/events_logs_tests.result rename to 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 similarity index 100% rename from mysql-test/t/events_logs_tests.test rename to mysql-test/main/events_logs_tests.test diff --git a/mysql-test/r/events_microsec.result b/mysql-test/main/events_microsec.result similarity index 100% rename from mysql-test/r/events_microsec.result rename to mysql-test/main/events_microsec.result diff --git a/mysql-test/t/events_microsec.test b/mysql-test/main/events_microsec.test similarity index 100% rename from mysql-test/t/events_microsec.test rename to mysql-test/main/events_microsec.test diff --git a/mysql-test/t/events_restart-master.opt b/mysql-test/main/events_restart-master.opt similarity index 100% rename from mysql-test/t/events_restart-master.opt rename to mysql-test/main/events_restart-master.opt diff --git a/mysql-test/r/events_restart.result b/mysql-test/main/events_restart.result similarity index 100% rename from mysql-test/r/events_restart.result rename to mysql-test/main/events_restart.result diff --git a/mysql-test/t/events_restart.test b/mysql-test/main/events_restart.test similarity index 100% rename from mysql-test/t/events_restart.test rename to mysql-test/main/events_restart.test diff --git a/mysql-test/r/events_scheduling.result b/mysql-test/main/events_scheduling.result similarity index 100% rename from mysql-test/r/events_scheduling.result rename to mysql-test/main/events_scheduling.result diff --git a/mysql-test/t/events_scheduling.test b/mysql-test/main/events_scheduling.test similarity index 100% rename from mysql-test/t/events_scheduling.test rename to mysql-test/main/events_scheduling.test diff --git a/mysql-test/r/events_slowlog.result b/mysql-test/main/events_slowlog.result similarity index 100% rename from mysql-test/r/events_slowlog.result rename to mysql-test/main/events_slowlog.result diff --git a/mysql-test/t/events_slowlog.test b/mysql-test/main/events_slowlog.test similarity index 100% rename from mysql-test/t/events_slowlog.test rename to mysql-test/main/events_slowlog.test diff --git a/mysql-test/r/events_stress.result b/mysql-test/main/events_stress.result similarity index 100% rename from mysql-test/r/events_stress.result rename to mysql-test/main/events_stress.result diff --git a/mysql-test/t/events_stress.test b/mysql-test/main/events_stress.test similarity index 100% rename from mysql-test/t/events_stress.test rename to mysql-test/main/events_stress.test diff --git a/mysql-test/r/events_time_zone.result b/mysql-test/main/events_time_zone.result similarity index 100% rename from mysql-test/r/events_time_zone.result rename to 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 similarity index 100% rename from mysql-test/t/events_time_zone.test rename to mysql-test/main/events_time_zone.test diff --git a/mysql-test/r/events_trans.result b/mysql-test/main/events_trans.result similarity index 100% rename from mysql-test/r/events_trans.result rename to mysql-test/main/events_trans.result diff --git a/mysql-test/t/events_trans.test b/mysql-test/main/events_trans.test similarity index 100% rename from mysql-test/t/events_trans.test rename to mysql-test/main/events_trans.test diff --git a/mysql-test/r/events_trans_notembedded.result b/mysql-test/main/events_trans_notembedded.result similarity index 100% rename from mysql-test/r/events_trans_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/events_trans_notembedded.test rename to mysql-test/main/events_trans_notembedded.test diff --git a/mysql-test/r/except.result b/mysql-test/main/except.result similarity index 100% rename from mysql-test/r/except.result rename to mysql-test/main/except.result diff --git a/mysql-test/t/except.test b/mysql-test/main/except.test similarity index 100% rename from mysql-test/t/except.test rename to mysql-test/main/except.test diff --git a/mysql-test/r/execution_constants.result b/mysql-test/main/execution_constants.result similarity index 100% rename from mysql-test/r/execution_constants.result rename to mysql-test/main/execution_constants.result diff --git a/mysql-test/t/execution_constants.test b/mysql-test/main/execution_constants.test similarity index 100% rename from mysql-test/t/execution_constants.test rename to mysql-test/main/execution_constants.test diff --git a/mysql-test/r/explain.result b/mysql-test/main/explain.result similarity index 100% rename from mysql-test/r/explain.result rename to mysql-test/main/explain.result diff --git a/mysql-test/t/explain.test b/mysql-test/main/explain.test similarity index 100% rename from mysql-test/t/explain.test rename to mysql-test/main/explain.test diff --git a/mysql-test/r/explain_json.result b/mysql-test/main/explain_json.result similarity index 100% rename from mysql-test/r/explain_json.result rename to mysql-test/main/explain_json.result diff --git a/mysql-test/t/explain_json.test b/mysql-test/main/explain_json.test similarity index 100% rename from mysql-test/t/explain_json.test rename to 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 similarity index 100% rename from mysql-test/r/explain_json_format_partitions.result rename to 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 similarity index 100% rename from mysql-test/t/explain_json_format_partitions.test rename to 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 similarity index 100% rename from mysql-test/r/explain_json_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/explain_json_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/explain_non_select.result rename to 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 similarity index 100% rename from mysql-test/t/explain_non_select.test rename to 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 similarity index 100% rename from mysql-test/t/explain_slowquerylog-master.opt rename to mysql-test/main/explain_slowquerylog-master.opt diff --git a/mysql-test/r/explain_slowquerylog.result b/mysql-test/main/explain_slowquerylog.result similarity index 100% rename from mysql-test/r/explain_slowquerylog.result rename to mysql-test/main/explain_slowquerylog.result diff --git a/mysql-test/t/explain_slowquerylog.test b/mysql-test/main/explain_slowquerylog.test similarity index 100% rename from mysql-test/t/explain_slowquerylog.test rename to 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 similarity index 100% rename from mysql-test/r/ext_key_noPK_6794.result rename to 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 similarity index 100% rename from mysql-test/t/ext_key_noPK_6794.test rename to 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 similarity index 100% rename from mysql-test/r/failed_auth_3909.result rename to 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 similarity index 100% rename from mysql-test/t/failed_auth_3909.test rename to 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 similarity index 100% rename from mysql-test/r/failed_auth_unixsocket.result rename to 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 similarity index 100% rename from mysql-test/t/failed_auth_unixsocket.test rename to 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 similarity index 100% rename from mysql-test/r/fast_prefix_index_fetch_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/fast_prefix_index_fetch_innodb.test rename to mysql-test/main/fast_prefix_index_fetch_innodb.test diff --git a/mysql-test/r/features.result b/mysql-test/main/features.result similarity index 100% rename from mysql-test/r/features.result rename to mysql-test/main/features.result diff --git a/mysql-test/t/features.test b/mysql-test/main/features.test similarity index 100% rename from mysql-test/t/features.test rename to mysql-test/main/features.test diff --git a/mysql-test/r/file_contents.result b/mysql-test/main/file_contents.result similarity index 100% rename from mysql-test/r/file_contents.result rename to mysql-test/main/file_contents.result diff --git a/mysql-test/t/file_contents.test b/mysql-test/main/file_contents.test similarity index 100% rename from mysql-test/t/file_contents.test rename to 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 similarity index 100% rename from mysql-test/r/filesort_bad_i_s-7585.result rename to 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 similarity index 100% rename from mysql-test/t/filesort_bad_i_s-7585.test rename to 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 similarity index 100% rename from mysql-test/r/filesort_debug.result rename to mysql-test/main/filesort_debug.result diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/main/filesort_debug.test similarity index 100% rename from mysql-test/t/filesort_debug.test rename to mysql-test/main/filesort_debug.test diff --git a/mysql-test/r/fix_priv_tables.result b/mysql-test/main/fix_priv_tables.result similarity index 100% rename from mysql-test/r/fix_priv_tables.result rename to 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 similarity index 100% rename from mysql-test/t/fix_priv_tables.test rename to 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 similarity index 100% rename from mysql-test/r/flush-innodb-notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/flush-innodb-notembedded.test rename to mysql-test/main/flush-innodb-notembedded.test diff --git a/mysql-test/r/flush-innodb.result b/mysql-test/main/flush-innodb.result similarity index 100% rename from mysql-test/r/flush-innodb.result rename to mysql-test/main/flush-innodb.result diff --git a/mysql-test/t/flush-innodb.test b/mysql-test/main/flush-innodb.test similarity index 100% rename from mysql-test/t/flush-innodb.test rename to mysql-test/main/flush-innodb.test diff --git a/mysql-test/r/flush.result b/mysql-test/main/flush.result similarity index 100% rename from mysql-test/r/flush.result rename to mysql-test/main/flush.result diff --git a/mysql-test/t/flush.test b/mysql-test/main/flush.test similarity index 100% rename from mysql-test/t/flush.test rename to mysql-test/main/flush.test diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/main/flush2-master.opt similarity index 100% rename from mysql-test/t/flush2-master.opt rename to mysql-test/main/flush2-master.opt diff --git a/mysql-test/r/flush2.result b/mysql-test/main/flush2.result similarity index 100% rename from mysql-test/r/flush2.result rename to mysql-test/main/flush2.result diff --git a/mysql-test/t/flush2.test b/mysql-test/main/flush2.test similarity index 100% rename from mysql-test/t/flush2.test rename to mysql-test/main/flush2.test diff --git a/mysql-test/r/flush_block_commit.result b/mysql-test/main/flush_block_commit.result similarity index 100% rename from mysql-test/r/flush_block_commit.result rename to 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 similarity index 100% rename from mysql-test/t/flush_block_commit.test rename to 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 similarity index 100% rename from mysql-test/r/flush_block_commit_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/flush_block_commit_notembedded.test rename to 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 similarity index 100% rename from mysql-test/r/flush_read_lock.result rename to 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 similarity index 100% rename from mysql-test/t/flush_read_lock.test rename to 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 similarity index 100% rename from mysql-test/r/flush_read_lock_kill.result rename to 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 similarity index 100% rename from mysql-test/t/flush_read_lock_kill.test rename to mysql-test/main/flush_read_lock_kill.test diff --git a/mysql-test/r/flush_table.result b/mysql-test/main/flush_table.result similarity index 100% rename from mysql-test/r/flush_table.result rename to mysql-test/main/flush_table.result diff --git a/mysql-test/t/flush_table.test b/mysql-test/main/flush_table.test similarity index 100% rename from mysql-test/t/flush_table.test rename to mysql-test/main/flush_table.test diff --git a/mysql-test/r/foreign_key.result b/mysql-test/main/foreign_key.result similarity index 100% rename from mysql-test/r/foreign_key.result rename to mysql-test/main/foreign_key.result diff --git a/mysql-test/t/foreign_key.test b/mysql-test/main/foreign_key.test similarity index 100% rename from mysql-test/t/foreign_key.test rename to 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 similarity index 100% rename from mysql-test/r/frm_bad_row_type-7333.result rename to 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 similarity index 100% rename from mysql-test/t/frm_bad_row_type-7333.test rename to mysql-test/main/frm_bad_row_type-7333.test diff --git a/mysql-test/r/fulltext.result b/mysql-test/main/fulltext.result similarity index 100% rename from mysql-test/r/fulltext.result rename to mysql-test/main/fulltext.result diff --git a/mysql-test/t/fulltext.test b/mysql-test/main/fulltext.test similarity index 100% rename from mysql-test/t/fulltext.test rename to mysql-test/main/fulltext.test diff --git a/mysql-test/r/fulltext2.result b/mysql-test/main/fulltext2.result similarity index 100% rename from mysql-test/r/fulltext2.result rename to mysql-test/main/fulltext2.result diff --git a/mysql-test/t/fulltext2.test b/mysql-test/main/fulltext2.test similarity index 100% rename from mysql-test/t/fulltext2.test rename to mysql-test/main/fulltext2.test diff --git a/mysql-test/r/fulltext3.result b/mysql-test/main/fulltext3.result similarity index 100% rename from mysql-test/r/fulltext3.result rename to mysql-test/main/fulltext3.result diff --git a/mysql-test/t/fulltext3.test b/mysql-test/main/fulltext3.test similarity index 100% rename from mysql-test/t/fulltext3.test rename to mysql-test/main/fulltext3.test diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/main/fulltext_cache.result similarity index 100% rename from mysql-test/r/fulltext_cache.result rename to mysql-test/main/fulltext_cache.result diff --git a/mysql-test/t/fulltext_cache.test b/mysql-test/main/fulltext_cache.test similarity index 100% rename from mysql-test/t/fulltext_cache.test rename to mysql-test/main/fulltext_cache.test diff --git a/mysql-test/r/fulltext_charsets.result b/mysql-test/main/fulltext_charsets.result similarity index 100% rename from mysql-test/r/fulltext_charsets.result rename to mysql-test/main/fulltext_charsets.result diff --git a/mysql-test/t/fulltext_charsets.test b/mysql-test/main/fulltext_charsets.test similarity index 100% rename from mysql-test/t/fulltext_charsets.test rename to mysql-test/main/fulltext_charsets.test diff --git a/mysql-test/r/fulltext_derived_4257.result b/mysql-test/main/fulltext_derived_4257.result similarity index 100% rename from mysql-test/r/fulltext_derived_4257.result rename to 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 similarity index 100% rename from mysql-test/t/fulltext_derived_4257.test rename to 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 similarity index 100% rename from mysql-test/r/fulltext_derived_4316.result rename to 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 similarity index 100% rename from mysql-test/t/fulltext_derived_4316.test rename to mysql-test/main/fulltext_derived_4316.test diff --git a/mysql-test/r/fulltext_distinct.result b/mysql-test/main/fulltext_distinct.result similarity index 100% rename from mysql-test/r/fulltext_distinct.result rename to mysql-test/main/fulltext_distinct.result diff --git a/mysql-test/t/fulltext_distinct.test b/mysql-test/main/fulltext_distinct.test similarity index 100% rename from mysql-test/t/fulltext_distinct.test rename to mysql-test/main/fulltext_distinct.test diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/main/fulltext_left_join.result similarity index 100% rename from mysql-test/r/fulltext_left_join.result rename to 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 similarity index 100% rename from mysql-test/t/fulltext_left_join.test rename to mysql-test/main/fulltext_left_join.test diff --git a/mysql-test/r/fulltext_multi.result b/mysql-test/main/fulltext_multi.result similarity index 100% rename from mysql-test/r/fulltext_multi.result rename to mysql-test/main/fulltext_multi.result diff --git a/mysql-test/t/fulltext_multi.test b/mysql-test/main/fulltext_multi.test similarity index 100% rename from mysql-test/t/fulltext_multi.test rename to mysql-test/main/fulltext_multi.test diff --git a/mysql-test/r/fulltext_order_by.result b/mysql-test/main/fulltext_order_by.result similarity index 100% rename from mysql-test/r/fulltext_order_by.result rename to 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 similarity index 100% rename from mysql-test/t/fulltext_order_by.test rename to mysql-test/main/fulltext_order_by.test diff --git a/mysql-test/r/fulltext_update.result b/mysql-test/main/fulltext_update.result similarity index 100% rename from mysql-test/r/fulltext_update.result rename to mysql-test/main/fulltext_update.result diff --git a/mysql-test/t/fulltext_update.test b/mysql-test/main/fulltext_update.test similarity index 100% rename from mysql-test/t/fulltext_update.test rename to mysql-test/main/fulltext_update.test diff --git a/mysql-test/r/fulltext_var.result b/mysql-test/main/fulltext_var.result similarity index 100% rename from mysql-test/r/fulltext_var.result rename to mysql-test/main/fulltext_var.result diff --git a/mysql-test/t/fulltext_var.test b/mysql-test/main/fulltext_var.test similarity index 100% rename from mysql-test/t/fulltext_var.test rename to mysql-test/main/fulltext_var.test diff --git a/mysql-test/r/func_analyse.result b/mysql-test/main/func_analyse.result similarity index 100% rename from mysql-test/r/func_analyse.result rename to mysql-test/main/func_analyse.result diff --git a/mysql-test/t/func_analyse.test b/mysql-test/main/func_analyse.test similarity index 100% rename from mysql-test/t/func_analyse.test rename to mysql-test/main/func_analyse.test diff --git a/mysql-test/r/func_compress.result b/mysql-test/main/func_compress.result similarity index 100% rename from mysql-test/r/func_compress.result rename to mysql-test/main/func_compress.result diff --git a/mysql-test/t/func_compress.test b/mysql-test/main/func_compress.test similarity index 100% rename from mysql-test/t/func_compress.test rename to mysql-test/main/func_compress.test diff --git a/mysql-test/r/func_concat.result b/mysql-test/main/func_concat.result similarity index 100% rename from mysql-test/r/func_concat.result rename to mysql-test/main/func_concat.result diff --git a/mysql-test/t/func_concat.test b/mysql-test/main/func_concat.test similarity index 100% rename from mysql-test/t/func_concat.test rename to mysql-test/main/func_concat.test diff --git a/mysql-test/r/func_crypt.result b/mysql-test/main/func_crypt.result similarity index 100% rename from mysql-test/r/func_crypt.result rename to mysql-test/main/func_crypt.result diff --git a/mysql-test/t/func_crypt.test b/mysql-test/main/func_crypt.test similarity index 100% rename from mysql-test/t/func_crypt.test rename to mysql-test/main/func_crypt.test diff --git a/mysql-test/r/func_date_add.result b/mysql-test/main/func_date_add.result similarity index 100% rename from mysql-test/r/func_date_add.result rename to 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 similarity index 100% rename from mysql-test/t/func_date_add.test rename to mysql-test/main/func_date_add.test diff --git a/mysql-test/r/func_debug.result b/mysql-test/main/func_debug.result similarity index 100% rename from mysql-test/r/func_debug.result rename to mysql-test/main/func_debug.result diff --git a/mysql-test/t/func_debug.test b/mysql-test/main/func_debug.test similarity index 100% rename from mysql-test/t/func_debug.test rename to mysql-test/main/func_debug.test diff --git a/mysql-test/r/func_default.result b/mysql-test/main/func_default.result similarity index 100% rename from mysql-test/r/func_default.result rename to mysql-test/main/func_default.result diff --git a/mysql-test/t/func_default.test b/mysql-test/main/func_default.test similarity index 100% rename from mysql-test/t/func_default.test rename to mysql-test/main/func_default.test diff --git a/mysql-test/r/func_des_encrypt.result b/mysql-test/main/func_des_encrypt.result similarity index 100% rename from mysql-test/r/func_des_encrypt.result rename to 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 similarity index 100% rename from mysql-test/t/func_des_encrypt.test rename to mysql-test/main/func_des_encrypt.test diff --git a/mysql-test/r/func_digest.result b/mysql-test/main/func_digest.result similarity index 100% rename from mysql-test/r/func_digest.result rename to mysql-test/main/func_digest.result diff --git a/mysql-test/t/func_digest.test b/mysql-test/main/func_digest.test similarity index 100% rename from mysql-test/t/func_digest.test rename to mysql-test/main/func_digest.test diff --git a/mysql-test/t/func_encrypt-master.opt b/mysql-test/main/func_encrypt-master.opt similarity index 100% rename from mysql-test/t/func_encrypt-master.opt rename to mysql-test/main/func_encrypt-master.opt diff --git a/mysql-test/r/func_encrypt.result b/mysql-test/main/func_encrypt.result similarity index 100% rename from mysql-test/r/func_encrypt.result rename to mysql-test/main/func_encrypt.result diff --git a/mysql-test/t/func_encrypt.test b/mysql-test/main/func_encrypt.test similarity index 100% rename from mysql-test/t/func_encrypt.test rename to mysql-test/main/func_encrypt.test diff --git a/mysql-test/r/func_encrypt_nossl.result b/mysql-test/main/func_encrypt_nossl.result similarity index 100% rename from mysql-test/r/func_encrypt_nossl.result rename to 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 similarity index 100% rename from mysql-test/t/func_encrypt_nossl.test rename to 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 similarity index 100% rename from mysql-test/r/func_encrypt_ucs2.result rename to 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 similarity index 100% rename from mysql-test/t/func_encrypt_ucs2.test rename to mysql-test/main/func_encrypt_ucs2.test diff --git a/mysql-test/r/func_equal.result b/mysql-test/main/func_equal.result similarity index 100% rename from mysql-test/r/func_equal.result rename to mysql-test/main/func_equal.result diff --git a/mysql-test/t/func_equal.test b/mysql-test/main/func_equal.test similarity index 100% rename from mysql-test/t/func_equal.test rename to mysql-test/main/func_equal.test diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/main/func_gconcat.result similarity index 100% rename from mysql-test/r/func_gconcat.result rename to mysql-test/main/func_gconcat.result diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/main/func_gconcat.test similarity index 100% rename from mysql-test/t/func_gconcat.test rename to mysql-test/main/func_gconcat.test diff --git a/mysql-test/r/func_group.result b/mysql-test/main/func_group.result similarity index 100% rename from mysql-test/r/func_group.result rename to mysql-test/main/func_group.result diff --git a/mysql-test/t/func_group.test b/mysql-test/main/func_group.test similarity index 100% rename from mysql-test/t/func_group.test rename to mysql-test/main/func_group.test diff --git a/mysql-test/r/func_group_innodb.result b/mysql-test/main/func_group_innodb.result similarity index 100% rename from mysql-test/r/func_group_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/func_group_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/func_hybrid_type.result rename to 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 similarity index 100% rename from mysql-test/t/func_hybrid_type.test rename to mysql-test/main/func_hybrid_type.test diff --git a/mysql-test/r/func_if.result b/mysql-test/main/func_if.result similarity index 100% rename from mysql-test/r/func_if.result rename to mysql-test/main/func_if.result diff --git a/mysql-test/t/func_if.test b/mysql-test/main/func_if.test similarity index 100% rename from mysql-test/t/func_if.test rename to mysql-test/main/func_if.test diff --git a/mysql-test/r/func_in.result b/mysql-test/main/func_in.result similarity index 100% rename from mysql-test/r/func_in.result rename to mysql-test/main/func_in.result diff --git a/mysql-test/t/func_in.test b/mysql-test/main/func_in.test similarity index 100% rename from mysql-test/t/func_in.test rename to mysql-test/main/func_in.test diff --git a/mysql-test/r/func_int.result b/mysql-test/main/func_int.result similarity index 100% rename from mysql-test/r/func_int.result rename to mysql-test/main/func_int.result diff --git a/mysql-test/t/func_int.test b/mysql-test/main/func_int.test similarity index 100% rename from mysql-test/t/func_int.test rename to mysql-test/main/func_int.test diff --git a/mysql-test/r/func_isnull.result b/mysql-test/main/func_isnull.result similarity index 100% rename from mysql-test/r/func_isnull.result rename to mysql-test/main/func_isnull.result diff --git a/mysql-test/t/func_isnull.test b/mysql-test/main/func_isnull.test similarity index 100% rename from mysql-test/t/func_isnull.test rename to mysql-test/main/func_isnull.test diff --git a/mysql-test/r/func_json.result b/mysql-test/main/func_json.result similarity index 100% rename from mysql-test/r/func_json.result rename to mysql-test/main/func_json.result diff --git a/mysql-test/t/func_json.test b/mysql-test/main/func_json.test similarity index 100% rename from mysql-test/t/func_json.test rename to mysql-test/main/func_json.test diff --git a/mysql-test/r/func_like.result b/mysql-test/main/func_like.result similarity index 100% rename from mysql-test/r/func_like.result rename to mysql-test/main/func_like.result diff --git a/mysql-test/t/func_like.test b/mysql-test/main/func_like.test similarity index 100% rename from mysql-test/t/func_like.test rename to mysql-test/main/func_like.test diff --git a/mysql-test/r/func_math.result b/mysql-test/main/func_math.result similarity index 100% rename from mysql-test/r/func_math.result rename to mysql-test/main/func_math.result diff --git a/mysql-test/t/func_math.test b/mysql-test/main/func_math.test similarity index 100% rename from mysql-test/t/func_math.test rename to mysql-test/main/func_math.test diff --git a/mysql-test/r/func_misc.result b/mysql-test/main/func_misc.result similarity index 100% rename from mysql-test/r/func_misc.result rename to mysql-test/main/func_misc.result diff --git a/mysql-test/t/func_misc.test b/mysql-test/main/func_misc.test similarity index 100% rename from mysql-test/t/func_misc.test rename to mysql-test/main/func_misc.test diff --git a/mysql-test/r/func_op.result b/mysql-test/main/func_op.result similarity index 100% rename from mysql-test/r/func_op.result rename to mysql-test/main/func_op.result diff --git a/mysql-test/t/func_op.test b/mysql-test/main/func_op.test similarity index 100% rename from mysql-test/t/func_op.test rename to mysql-test/main/func_op.test diff --git a/mysql-test/r/func_regexp.result b/mysql-test/main/func_regexp.result similarity index 100% rename from mysql-test/r/func_regexp.result rename to mysql-test/main/func_regexp.result diff --git a/mysql-test/t/func_regexp.test b/mysql-test/main/func_regexp.test similarity index 100% rename from mysql-test/t/func_regexp.test rename to mysql-test/main/func_regexp.test diff --git a/mysql-test/r/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result similarity index 100% rename from mysql-test/r/func_regexp_pcre.result rename to 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 similarity index 100% rename from mysql-test/t/func_regexp_pcre.test rename to 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 similarity index 100% rename from mysql-test/r/func_regexp_pcre_debug.result rename to 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 similarity index 100% rename from mysql-test/t/func_regexp_pcre_debug.test rename to mysql-test/main/func_regexp_pcre_debug.test diff --git a/mysql-test/r/func_rollback.result b/mysql-test/main/func_rollback.result similarity index 100% rename from mysql-test/r/func_rollback.result rename to mysql-test/main/func_rollback.result diff --git a/mysql-test/t/func_rollback.test b/mysql-test/main/func_rollback.test similarity index 100% rename from mysql-test/t/func_rollback.test rename to mysql-test/main/func_rollback.test diff --git a/mysql-test/r/func_sapdb.result b/mysql-test/main/func_sapdb.result similarity index 100% rename from mysql-test/r/func_sapdb.result rename to mysql-test/main/func_sapdb.result diff --git a/mysql-test/t/func_sapdb.test b/mysql-test/main/func_sapdb.test similarity index 100% rename from mysql-test/t/func_sapdb.test rename to mysql-test/main/func_sapdb.test diff --git a/mysql-test/r/func_set.result b/mysql-test/main/func_set.result similarity index 100% rename from mysql-test/r/func_set.result rename to mysql-test/main/func_set.result diff --git a/mysql-test/t/func_set.test b/mysql-test/main/func_set.test similarity index 100% rename from mysql-test/t/func_set.test rename to mysql-test/main/func_set.test diff --git a/mysql-test/r/func_str.result b/mysql-test/main/func_str.result similarity index 100% rename from mysql-test/r/func_str.result rename to mysql-test/main/func_str.result diff --git a/mysql-test/t/func_str.test b/mysql-test/main/func_str.test similarity index 100% rename from mysql-test/t/func_str.test rename to mysql-test/main/func_str.test diff --git a/mysql-test/r/func_system.result b/mysql-test/main/func_system.result similarity index 100% rename from mysql-test/r/func_system.result rename to mysql-test/main/func_system.result diff --git a/mysql-test/t/func_system.test b/mysql-test/main/func_system.test similarity index 100% rename from mysql-test/t/func_system.test rename to mysql-test/main/func_system.test diff --git a/mysql-test/r/func_test.result b/mysql-test/main/func_test.result similarity index 100% rename from mysql-test/r/func_test.result rename to mysql-test/main/func_test.result diff --git a/mysql-test/t/func_test.test b/mysql-test/main/func_test.test similarity index 100% rename from mysql-test/t/func_test.test rename to mysql-test/main/func_test.test diff --git a/mysql-test/r/func_time.result b/mysql-test/main/func_time.result similarity index 100% rename from mysql-test/r/func_time.result rename to mysql-test/main/func_time.result diff --git a/mysql-test/t/func_time.test b/mysql-test/main/func_time.test similarity index 100% rename from mysql-test/t/func_time.test rename to mysql-test/main/func_time.test diff --git a/mysql-test/r/func_time_hires.result b/mysql-test/main/func_time_hires.result similarity index 100% rename from mysql-test/r/func_time_hires.result rename to 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 similarity index 100% rename from mysql-test/t/func_time_hires.test rename to mysql-test/main/func_time_hires.test diff --git a/mysql-test/r/func_timestamp.result b/mysql-test/main/func_timestamp.result similarity index 100% rename from mysql-test/r/func_timestamp.result rename to mysql-test/main/func_timestamp.result diff --git a/mysql-test/t/func_timestamp.test b/mysql-test/main/func_timestamp.test similarity index 100% rename from mysql-test/t/func_timestamp.test rename to mysql-test/main/func_timestamp.test diff --git a/mysql-test/r/func_weight_string.result b/mysql-test/main/func_weight_string.result similarity index 100% rename from mysql-test/r/func_weight_string.result rename to 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 similarity index 100% rename from mysql-test/t/func_weight_string.test rename to mysql-test/main/func_weight_string.test diff --git a/mysql-test/r/function_defaults.result b/mysql-test/main/function_defaults.result similarity index 100% rename from mysql-test/r/function_defaults.result rename to mysql-test/main/function_defaults.result diff --git a/mysql-test/t/function_defaults.test b/mysql-test/main/function_defaults.test similarity index 100% rename from mysql-test/t/function_defaults.test rename to mysql-test/main/function_defaults.test diff --git a/mysql-test/r/function_defaults_innodb.result b/mysql-test/main/function_defaults_innodb.result similarity index 100% rename from mysql-test/r/function_defaults_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/function_defaults_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/function_defaults_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/function_defaults_notembedded.test rename to mysql-test/main/function_defaults_notembedded.test diff --git a/mysql-test/r/gcc296.result b/mysql-test/main/gcc296.result similarity index 100% rename from mysql-test/r/gcc296.result rename to mysql-test/main/gcc296.result diff --git a/mysql-test/t/gcc296.test b/mysql-test/main/gcc296.test similarity index 100% rename from mysql-test/t/gcc296.test rename to mysql-test/main/gcc296.test diff --git a/mysql-test/r/get_diagnostics.result b/mysql-test/main/get_diagnostics.result similarity index 100% rename from mysql-test/r/get_diagnostics.result rename to mysql-test/main/get_diagnostics.result diff --git a/mysql-test/t/get_diagnostics.test b/mysql-test/main/get_diagnostics.test similarity index 100% rename from mysql-test/t/get_diagnostics.test rename to 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 similarity index 100% rename from mysql-test/r/gis-alter_table_online.result rename to 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 similarity index 100% rename from mysql-test/t/gis-alter_table_online.test rename to mysql-test/main/gis-alter_table_online.test diff --git a/mysql-test/r/gis-debug.result b/mysql-test/main/gis-debug.result similarity index 100% rename from mysql-test/r/gis-debug.result rename to mysql-test/main/gis-debug.result diff --git a/mysql-test/t/gis-debug.test b/mysql-test/main/gis-debug.test similarity index 100% rename from mysql-test/t/gis-debug.test rename to mysql-test/main/gis-debug.test diff --git a/mysql-test/r/gis-json.result b/mysql-test/main/gis-json.result similarity index 100% rename from mysql-test/r/gis-json.result rename to mysql-test/main/gis-json.result diff --git a/mysql-test/t/gis-json.test b/mysql-test/main/gis-json.test similarity index 100% rename from mysql-test/t/gis-json.test rename to mysql-test/main/gis-json.test diff --git a/mysql-test/r/gis-loaddata.result b/mysql-test/main/gis-loaddata.result similarity index 100% rename from mysql-test/r/gis-loaddata.result rename to mysql-test/main/gis-loaddata.result diff --git a/mysql-test/t/gis-loaddata.test b/mysql-test/main/gis-loaddata.test similarity index 100% rename from mysql-test/t/gis-loaddata.test rename to mysql-test/main/gis-loaddata.test diff --git a/mysql-test/r/gis-precise.result b/mysql-test/main/gis-precise.result similarity index 100% rename from mysql-test/r/gis-precise.result rename to mysql-test/main/gis-precise.result diff --git a/mysql-test/t/gis-precise.test b/mysql-test/main/gis-precise.test similarity index 100% rename from mysql-test/t/gis-precise.test rename to mysql-test/main/gis-precise.test diff --git a/mysql-test/r/gis-rt-precise.result b/mysql-test/main/gis-rt-precise.result similarity index 100% rename from mysql-test/r/gis-rt-precise.result rename to 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 similarity index 100% rename from mysql-test/t/gis-rt-precise.test rename to mysql-test/main/gis-rt-precise.test diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/main/gis-rtree.result similarity index 100% rename from mysql-test/r/gis-rtree.result rename to mysql-test/main/gis-rtree.result diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/main/gis-rtree.test similarity index 100% rename from mysql-test/t/gis-rtree.test rename to mysql-test/main/gis-rtree.test diff --git a/mysql-test/r/gis.result b/mysql-test/main/gis.result similarity index 100% rename from mysql-test/r/gis.result rename to mysql-test/main/gis.result diff --git a/mysql-test/t/gis.test b/mysql-test/main/gis.test similarity index 100% rename from mysql-test/t/gis.test rename to mysql-test/main/gis.test diff --git a/mysql-test/r/gis2.result b/mysql-test/main/gis2.result similarity index 100% rename from mysql-test/r/gis2.result rename to mysql-test/main/gis2.result diff --git a/mysql-test/t/gis2.test b/mysql-test/main/gis2.test similarity index 100% rename from mysql-test/t/gis2.test rename to mysql-test/main/gis2.test diff --git a/mysql-test/r/grant.result b/mysql-test/main/grant.result similarity index 100% rename from mysql-test/r/grant.result rename to mysql-test/main/grant.result diff --git a/mysql-test/t/grant.test b/mysql-test/main/grant.test similarity index 100% rename from mysql-test/t/grant.test rename to mysql-test/main/grant.test diff --git a/mysql-test/r/grant2.result b/mysql-test/main/grant2.result similarity index 100% rename from mysql-test/r/grant2.result rename to mysql-test/main/grant2.result diff --git a/mysql-test/t/grant2.test b/mysql-test/main/grant2.test similarity index 100% rename from mysql-test/t/grant2.test rename to mysql-test/main/grant2.test diff --git a/mysql-test/t/grant3-master.opt b/mysql-test/main/grant3-master.opt similarity index 100% rename from mysql-test/t/grant3-master.opt rename to mysql-test/main/grant3-master.opt diff --git a/mysql-test/r/grant3.result b/mysql-test/main/grant3.result similarity index 100% rename from mysql-test/r/grant3.result rename to mysql-test/main/grant3.result diff --git a/mysql-test/t/grant3.test b/mysql-test/main/grant3.test similarity index 100% rename from mysql-test/t/grant3.test rename to mysql-test/main/grant3.test diff --git a/mysql-test/r/grant4.result b/mysql-test/main/grant4.result similarity index 100% rename from mysql-test/r/grant4.result rename to mysql-test/main/grant4.result diff --git a/mysql-test/t/grant4.test b/mysql-test/main/grant4.test similarity index 100% rename from mysql-test/t/grant4.test rename to mysql-test/main/grant4.test diff --git a/mysql-test/r/grant5.result b/mysql-test/main/grant5.result similarity index 100% rename from mysql-test/r/grant5.result rename to mysql-test/main/grant5.result diff --git a/mysql-test/t/grant5.test b/mysql-test/main/grant5.test similarity index 100% rename from mysql-test/t/grant5.test rename to mysql-test/main/grant5.test diff --git a/mysql-test/r/grant_4332.result b/mysql-test/main/grant_4332.result similarity index 100% rename from mysql-test/r/grant_4332.result rename to mysql-test/main/grant_4332.result diff --git a/mysql-test/t/grant_4332.test b/mysql-test/main/grant_4332.test similarity index 100% rename from mysql-test/t/grant_4332.test rename to 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 similarity index 100% rename from mysql-test/r/grant_cache_no_prot.result rename to 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 similarity index 100% rename from mysql-test/t/grant_cache_no_prot.test rename to 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 similarity index 100% rename from mysql-test/r/grant_cache_ps_prot.result rename to 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 similarity index 100% rename from mysql-test/t/grant_cache_ps_prot.test rename to 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 similarity index 100% rename from mysql-test/r/grant_explain_non_select.result rename to 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 similarity index 100% rename from mysql-test/t/grant_explain_non_select.test rename to mysql-test/main/grant_explain_non_select.test diff --git a/mysql-test/t/grant_lowercase.opt b/mysql-test/main/grant_lowercase.opt similarity index 100% rename from mysql-test/t/grant_lowercase.opt rename to mysql-test/main/grant_lowercase.opt diff --git a/mysql-test/r/grant_lowercase.result b/mysql-test/main/grant_lowercase.result similarity index 100% rename from mysql-test/r/grant_lowercase.result rename to mysql-test/main/grant_lowercase.result diff --git a/mysql-test/t/grant_lowercase.test b/mysql-test/main/grant_lowercase.test similarity index 100% rename from mysql-test/t/grant_lowercase.test rename to mysql-test/main/grant_lowercase.test diff --git a/mysql-test/r/grant_lowercase_fs.result b/mysql-test/main/grant_lowercase_fs.result similarity index 100% rename from mysql-test/r/grant_lowercase_fs.result rename to 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 similarity index 100% rename from mysql-test/t/grant_lowercase_fs.test rename to mysql-test/main/grant_lowercase_fs.test diff --git a/mysql-test/r/greedy_optimizer.result b/mysql-test/main/greedy_optimizer.result similarity index 100% rename from mysql-test/r/greedy_optimizer.result rename to mysql-test/main/greedy_optimizer.result diff --git a/mysql-test/t/greedy_optimizer.test b/mysql-test/main/greedy_optimizer.test similarity index 100% rename from mysql-test/t/greedy_optimizer.test rename to mysql-test/main/greedy_optimizer.test diff --git a/mysql-test/r/group_by.result b/mysql-test/main/group_by.result similarity index 100% rename from mysql-test/r/group_by.result rename to mysql-test/main/group_by.result diff --git a/mysql-test/t/group_by.test b/mysql-test/main/group_by.test similarity index 100% rename from mysql-test/t/group_by.test rename to mysql-test/main/group_by.test diff --git a/mysql-test/r/group_by_innodb.result b/mysql-test/main/group_by_innodb.result similarity index 100% rename from mysql-test/r/group_by_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/group_by_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/group_by_null.result rename to 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 similarity index 100% rename from mysql-test/t/group_by_null.test rename to 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 similarity index 100% rename from mysql-test/r/group_min_max.result rename to 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 similarity index 100% rename from mysql-test/t/group_min_max.test rename to 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 similarity index 100% rename from mysql-test/r/group_min_max_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/group_min_max_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/handler_read_last.result rename to 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 similarity index 100% rename from mysql-test/t/handler_read_last.test rename to mysql-test/main/handler_read_last.test diff --git a/mysql-test/r/handlersocket.result b/mysql-test/main/handlersocket.result similarity index 100% rename from mysql-test/r/handlersocket.result rename to mysql-test/main/handlersocket.result diff --git a/mysql-test/t/handlersocket.test b/mysql-test/main/handlersocket.test similarity index 100% rename from mysql-test/t/handlersocket.test rename to mysql-test/main/handlersocket.test diff --git a/mysql-test/r/having.result b/mysql-test/main/having.result similarity index 100% rename from mysql-test/r/having.result rename to mysql-test/main/having.result diff --git a/mysql-test/t/having.test b/mysql-test/main/having.test similarity index 100% rename from mysql-test/t/having.test rename to mysql-test/main/having.test diff --git a/mysql-test/r/help.result b/mysql-test/main/help.result similarity index 100% rename from mysql-test/r/help.result rename to mysql-test/main/help.result diff --git a/mysql-test/t/help.test b/mysql-test/main/help.test similarity index 100% rename from mysql-test/t/help.test rename to 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 similarity index 100% rename from mysql-test/r/host_cache_size_functionality.result rename to 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 similarity index 100% rename from mysql-test/t/host_cache_size_functionality.test rename to 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 similarity index 100% rename from mysql-test/r/huge_frm-6224.result rename to 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 similarity index 100% rename from mysql-test/t/huge_frm-6224.test rename to 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 similarity index 100% rename from mysql-test/r/implicit_char_to_num_conversion.result rename to 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 similarity index 100% rename from mysql-test/t/implicit_char_to_num_conversion.test rename to 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 similarity index 100% rename from mysql-test/t/implicit_commit-master.opt rename to mysql-test/main/implicit_commit-master.opt diff --git a/mysql-test/r/implicit_commit.result b/mysql-test/main/implicit_commit.result similarity index 100% rename from mysql-test/r/implicit_commit.result rename to mysql-test/main/implicit_commit.result diff --git a/mysql-test/t/implicit_commit.test b/mysql-test/main/implicit_commit.test similarity index 100% rename from mysql-test/t/implicit_commit.test rename to mysql-test/main/implicit_commit.test diff --git a/mysql-test/r/in_datetime_241.result b/mysql-test/main/in_datetime_241.result similarity index 100% rename from mysql-test/r/in_datetime_241.result rename to 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 similarity index 100% rename from mysql-test/t/in_datetime_241.test rename to mysql-test/main/in_datetime_241.test diff --git a/mysql-test/r/index_intersect.result b/mysql-test/main/index_intersect.result similarity index 100% rename from mysql-test/r/index_intersect.result rename to mysql-test/main/index_intersect.result diff --git a/mysql-test/t/index_intersect.test b/mysql-test/main/index_intersect.test similarity index 100% rename from mysql-test/t/index_intersect.test rename to mysql-test/main/index_intersect.test diff --git a/mysql-test/r/index_intersect_innodb.result b/mysql-test/main/index_intersect_innodb.result similarity index 100% rename from mysql-test/r/index_intersect_innodb.result rename to 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 similarity index 77% rename from mysql-test/t/index_intersect_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/index_merge_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/index_merge_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/index_merge_myisam.result rename to 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 similarity index 100% rename from mysql-test/t/index_merge_myisam.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema-big.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema-big.test rename to mysql-test/main/information_schema-big.test diff --git a/mysql-test/r/information_schema.result b/mysql-test/main/information_schema.result similarity index 100% rename from mysql-test/r/information_schema.result rename to mysql-test/main/information_schema.result diff --git a/mysql-test/t/information_schema.test b/mysql-test/main/information_schema.test similarity index 100% rename from mysql-test/t/information_schema.test rename to mysql-test/main/information_schema.test diff --git a/mysql-test/r/information_schema2.result b/mysql-test/main/information_schema2.result similarity index 100% rename from mysql-test/r/information_schema2.result rename to mysql-test/main/information_schema2.result diff --git a/mysql-test/t/information_schema2.test b/mysql-test/main/information_schema2.test similarity index 100% rename from mysql-test/t/information_schema2.test rename to 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 similarity index 100% rename from mysql-test/t/information_schema_all_engines-master.opt rename to 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 similarity index 100% rename from mysql-test/r/information_schema_all_engines.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_all_engines.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_chmod.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_chmod.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_db.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_db.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_inno.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_inno.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_linux.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_linux.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_parameters.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_parameters.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_part.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_part.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_routines.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_routines.test rename to 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 similarity index 100% rename from mysql-test/r/information_schema_stats.result rename to 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 similarity index 100% rename from mysql-test/t/information_schema_stats.test rename to 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 similarity index 100% rename from mysql-test/t/init_connect-master.opt rename to mysql-test/main/init_connect-master.opt diff --git a/mysql-test/r/init_connect.result b/mysql-test/main/init_connect.result similarity index 100% rename from mysql-test/r/init_connect.result rename to mysql-test/main/init_connect.result diff --git a/mysql-test/t/init_connect.test b/mysql-test/main/init_connect.test similarity index 100% rename from mysql-test/t/init_connect.test rename to 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 similarity index 100% rename from mysql-test/t/init_connection_query_cache-master.opt rename to 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 similarity index 100% rename from mysql-test/r/init_connection_query_cache.result rename to 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 similarity index 100% rename from mysql-test/t/init_connection_query_cache.test rename to mysql-test/main/init_connection_query_cache.test diff --git a/mysql-test/t/init_file.opt b/mysql-test/main/init_file.opt similarity index 100% rename from mysql-test/t/init_file.opt rename to mysql-test/main/init_file.opt diff --git a/mysql-test/r/init_file.result b/mysql-test/main/init_file.result similarity index 100% rename from mysql-test/r/init_file.result rename to mysql-test/main/init_file.result diff --git a/mysql-test/t/init_file.test b/mysql-test/main/init_file.test similarity index 100% rename from mysql-test/t/init_file.test rename to 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 similarity index 100% rename from mysql-test/t/init_file_longline_3816.opt rename to 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 similarity index 100% rename from mysql-test/r/init_file_longline_3816.result rename to 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 similarity index 100% rename from mysql-test/t/init_file_longline_3816.test rename to 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 similarity index 100% rename from mysql-test/r/init_file_set_password-7656.result rename to 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 similarity index 100% rename from mysql-test/t/init_file_set_password-7656.test rename to 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 similarity index 100% rename from mysql-test/r/innodb_bug878769.result rename to mysql-test/main/innodb_bug878769.result diff --git a/mysql-test/t/innodb_bug878769.test b/mysql-test/main/innodb_bug878769.test similarity index 100% rename from mysql-test/t/innodb_bug878769.test rename to mysql-test/main/innodb_bug878769.test diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result similarity index 100% rename from mysql-test/r/innodb_ext_key.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_ext_key.test rename to mysql-test/main/innodb_ext_key.test diff --git a/mysql-test/r/innodb_group.result b/mysql-test/main/innodb_group.result similarity index 100% rename from mysql-test/r/innodb_group.result rename to mysql-test/main/innodb_group.result diff --git a/mysql-test/t/innodb_group.test b/mysql-test/main/innodb_group.test similarity index 100% rename from mysql-test/t/innodb_group.test rename to mysql-test/main/innodb_group.test diff --git a/mysql-test/r/innodb_icp.result b/mysql-test/main/innodb_icp.result similarity index 100% rename from mysql-test/r/innodb_icp.result rename to mysql-test/main/innodb_icp.result diff --git a/mysql-test/t/innodb_icp.test b/mysql-test/main/innodb_icp.test similarity index 100% rename from mysql-test/t/innodb_icp.test rename to 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 similarity index 100% rename from mysql-test/t/innodb_ignore_builtin-master.opt rename to 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 similarity index 100% rename from mysql-test/r/innodb_ignore_builtin.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_ignore_builtin.test rename to 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 similarity index 100% rename from mysql-test/t/innodb_load_xa.opt rename to 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 similarity index 100% rename from mysql-test/r/innodb_load_xa.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_load_xa.test rename to 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 similarity index 100% rename from mysql-test/r/innodb_mrr_cpk.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_mrr_cpk.test rename to 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 similarity index 100% rename from mysql-test/r/innodb_mysql_lock.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_mysql_lock.test rename to 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 similarity index 100% rename from mysql-test/r/innodb_mysql_lock2.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_mysql_lock2.test rename to 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 similarity index 100% rename from mysql-test/r/innodb_mysql_sync.result rename to 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 similarity index 100% rename from mysql-test/t/innodb_mysql_sync.test rename to mysql-test/main/innodb_mysql_sync.test diff --git a/mysql-test/r/innodb_utf8.result b/mysql-test/main/innodb_utf8.result similarity index 100% rename from mysql-test/r/innodb_utf8.result rename to mysql-test/main/innodb_utf8.result diff --git a/mysql-test/t/innodb_utf8.test b/mysql-test/main/innodb_utf8.test similarity index 100% rename from mysql-test/t/innodb_utf8.test rename to mysql-test/main/innodb_utf8.test diff --git a/mysql-test/r/insert.result b/mysql-test/main/insert.result similarity index 100% rename from mysql-test/r/insert.result rename to mysql-test/main/insert.result diff --git a/mysql-test/t/insert.test b/mysql-test/main/insert.test similarity index 100% rename from mysql-test/t/insert.test rename to mysql-test/main/insert.test diff --git a/mysql-test/r/insert_innodb.result b/mysql-test/main/insert_innodb.result similarity index 100% rename from mysql-test/r/insert_innodb.result rename to mysql-test/main/insert_innodb.result diff --git a/mysql-test/t/insert_innodb.test b/mysql-test/main/insert_innodb.test similarity index 100% rename from mysql-test/t/insert_innodb.test rename to mysql-test/main/insert_innodb.test diff --git a/mysql-test/r/insert_notembedded.result b/mysql-test/main/insert_notembedded.result similarity index 100% rename from mysql-test/r/insert_notembedded.result rename to mysql-test/main/insert_notembedded.result diff --git a/mysql-test/t/insert_notembedded.test b/mysql-test/main/insert_notembedded.test similarity index 100% rename from mysql-test/t/insert_notembedded.test rename to mysql-test/main/insert_notembedded.test diff --git a/mysql-test/r/insert_select.result b/mysql-test/main/insert_select.result similarity index 100% rename from mysql-test/r/insert_select.result rename to mysql-test/main/insert_select.result diff --git a/mysql-test/t/insert_select.test b/mysql-test/main/insert_select.test similarity index 100% rename from mysql-test/t/insert_select.test rename to mysql-test/main/insert_select.test diff --git a/mysql-test/r/insert_update.result b/mysql-test/main/insert_update.result similarity index 100% rename from mysql-test/r/insert_update.result rename to mysql-test/main/insert_update.result diff --git a/mysql-test/t/insert_update.test b/mysql-test/main/insert_update.test similarity index 100% rename from mysql-test/t/insert_update.test rename to 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 similarity index 100% rename from mysql-test/r/insert_update_autoinc-7150.result rename to 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 similarity index 100% rename from mysql-test/t/insert_update_autoinc-7150.test rename to mysql-test/main/insert_update_autoinc-7150.test diff --git a/mysql-test/r/intersect.result b/mysql-test/main/intersect.result similarity index 100% rename from mysql-test/r/intersect.result rename to mysql-test/main/intersect.result diff --git a/mysql-test/t/intersect.test b/mysql-test/main/intersect.test similarity index 100% rename from mysql-test/t/intersect.test rename to mysql-test/main/intersect.test diff --git a/mysql-test/r/invisible_binlog.result b/mysql-test/main/invisible_binlog.result similarity index 100% rename from mysql-test/r/invisible_binlog.result rename to mysql-test/main/invisible_binlog.result diff --git a/mysql-test/t/invisible_binlog.test b/mysql-test/main/invisible_binlog.test similarity index 100% rename from mysql-test/t/invisible_binlog.test rename to mysql-test/main/invisible_binlog.test diff --git a/mysql-test/r/invisible_field.result b/mysql-test/main/invisible_field.result similarity index 100% rename from mysql-test/r/invisible_field.result rename to mysql-test/main/invisible_field.result diff --git a/mysql-test/t/invisible_field.test b/mysql-test/main/invisible_field.test similarity index 100% rename from mysql-test/t/invisible_field.test rename to mysql-test/main/invisible_field.test diff --git a/mysql-test/r/invisible_field_debug.result b/mysql-test/main/invisible_field_debug.result similarity index 100% rename from mysql-test/r/invisible_field_debug.result rename to 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 similarity index 100% rename from mysql-test/t/invisible_field_debug.test rename to 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 similarity index 100% rename from mysql-test/t/ipv4_and_ipv6.opt rename to 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 similarity index 100% rename from mysql-test/r/ipv4_and_ipv6.result rename to 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 similarity index 100% rename from mysql-test/t/ipv4_and_ipv6.test rename to 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 similarity index 100% rename from mysql-test/t/ipv4_as_ipv6-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ipv4_as_ipv6.result rename to 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 similarity index 100% rename from mysql-test/t/ipv4_as_ipv6.test rename to mysql-test/main/ipv4_as_ipv6.test diff --git a/mysql-test/t/ipv6-master.opt b/mysql-test/main/ipv6-master.opt similarity index 100% rename from mysql-test/t/ipv6-master.opt rename to mysql-test/main/ipv6-master.opt diff --git a/mysql-test/r/ipv6.result b/mysql-test/main/ipv6.result similarity index 100% rename from mysql-test/r/ipv6.result rename to mysql-test/main/ipv6.result diff --git a/mysql-test/t/ipv6.test b/mysql-test/main/ipv6.test similarity index 100% rename from mysql-test/t/ipv6.test rename to mysql-test/main/ipv6.test diff --git a/mysql-test/r/join.result b/mysql-test/main/join.result similarity index 100% rename from mysql-test/r/join.result rename to mysql-test/main/join.result diff --git a/mysql-test/t/join.test b/mysql-test/main/join.test similarity index 100% rename from mysql-test/t/join.test rename to mysql-test/main/join.test diff --git a/mysql-test/r/join_cache.result b/mysql-test/main/join_cache.result similarity index 100% rename from mysql-test/r/join_cache.result rename to mysql-test/main/join_cache.result diff --git a/mysql-test/t/join_cache.test b/mysql-test/main/join_cache.test similarity index 100% rename from mysql-test/t/join_cache.test rename to mysql-test/main/join_cache.test diff --git a/mysql-test/r/join_crash.result b/mysql-test/main/join_crash.result similarity index 100% rename from mysql-test/r/join_crash.result rename to mysql-test/main/join_crash.result diff --git a/mysql-test/t/join_crash.test b/mysql-test/main/join_crash.test similarity index 100% rename from mysql-test/t/join_crash.test rename to mysql-test/main/join_crash.test diff --git a/mysql-test/r/join_nested.result b/mysql-test/main/join_nested.result similarity index 100% rename from mysql-test/r/join_nested.result rename to mysql-test/main/join_nested.result diff --git a/mysql-test/t/join_nested.test b/mysql-test/main/join_nested.test similarity index 100% rename from mysql-test/t/join_nested.test rename to mysql-test/main/join_nested.test diff --git a/mysql-test/r/join_nested_jcl6.result b/mysql-test/main/join_nested_jcl6.result similarity index 100% rename from mysql-test/r/join_nested_jcl6.result rename to 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 similarity index 99% rename from mysql-test/t/join_nested_jcl6.test rename to 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 similarity index 100% rename from mysql-test/r/join_optimizer.result rename to mysql-test/main/join_optimizer.result diff --git a/mysql-test/t/join_optimizer.test b/mysql-test/main/join_optimizer.test similarity index 100% rename from mysql-test/t/join_optimizer.test rename to mysql-test/main/join_optimizer.test diff --git a/mysql-test/r/join_outer.result b/mysql-test/main/join_outer.result similarity index 100% rename from mysql-test/r/join_outer.result rename to mysql-test/main/join_outer.result diff --git a/mysql-test/t/join_outer.test b/mysql-test/main/join_outer.test similarity index 100% rename from mysql-test/t/join_outer.test rename to mysql-test/main/join_outer.test diff --git a/mysql-test/r/join_outer_innodb.result b/mysql-test/main/join_outer_innodb.result similarity index 100% rename from mysql-test/r/join_outer_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/join_outer_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/join_outer_jcl6.result rename to 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 similarity index 96% rename from mysql-test/t/join_outer_jcl6.test rename to 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 similarity index 100% rename from mysql-test/r/key.result rename to mysql-test/main/key.result diff --git a/mysql-test/t/key.test b/mysql-test/main/key.test similarity index 100% rename from mysql-test/t/key.test rename to mysql-test/main/key.test diff --git a/mysql-test/t/key_cache-master.opt b/mysql-test/main/key_cache-master.opt similarity index 100% rename from mysql-test/t/key_cache-master.opt rename to mysql-test/main/key_cache-master.opt diff --git a/mysql-test/r/key_cache.result b/mysql-test/main/key_cache.result similarity index 100% rename from mysql-test/r/key_cache.result rename to mysql-test/main/key_cache.result diff --git a/mysql-test/t/key_cache.test b/mysql-test/main/key_cache.test similarity index 100% rename from mysql-test/t/key_cache.test rename to mysql-test/main/key_cache.test diff --git a/mysql-test/r/key_diff.result b/mysql-test/main/key_diff.result similarity index 100% rename from mysql-test/r/key_diff.result rename to mysql-test/main/key_diff.result diff --git a/mysql-test/t/key_diff.test b/mysql-test/main/key_diff.test similarity index 100% rename from mysql-test/t/key_diff.test rename to mysql-test/main/key_diff.test diff --git a/mysql-test/r/key_primary.result b/mysql-test/main/key_primary.result similarity index 100% rename from mysql-test/r/key_primary.result rename to mysql-test/main/key_primary.result diff --git a/mysql-test/t/key_primary.test b/mysql-test/main/key_primary.test similarity index 100% rename from mysql-test/t/key_primary.test rename to mysql-test/main/key_primary.test diff --git a/mysql-test/r/keyread.result b/mysql-test/main/keyread.result similarity index 100% rename from mysql-test/r/keyread.result rename to mysql-test/main/keyread.result diff --git a/mysql-test/t/keyread.test b/mysql-test/main/keyread.test similarity index 100% rename from mysql-test/t/keyread.test rename to mysql-test/main/keyread.test diff --git a/mysql-test/r/keywords.result b/mysql-test/main/keywords.result similarity index 100% rename from mysql-test/r/keywords.result rename to mysql-test/main/keywords.result diff --git a/mysql-test/t/keywords.test b/mysql-test/main/keywords.test similarity index 100% rename from mysql-test/t/keywords.test rename to mysql-test/main/keywords.test diff --git a/mysql-test/t/kill-2-master.opt b/mysql-test/main/kill-2-master.opt similarity index 100% rename from mysql-test/t/kill-2-master.opt rename to mysql-test/main/kill-2-master.opt diff --git a/mysql-test/r/kill-2.result b/mysql-test/main/kill-2.result similarity index 100% rename from mysql-test/r/kill-2.result rename to mysql-test/main/kill-2.result diff --git a/mysql-test/t/kill-2.test b/mysql-test/main/kill-2.test similarity index 100% rename from mysql-test/t/kill-2.test rename to mysql-test/main/kill-2.test diff --git a/mysql-test/r/kill.result b/mysql-test/main/kill.result similarity index 100% rename from mysql-test/r/kill.result rename to mysql-test/main/kill.result diff --git a/mysql-test/t/kill.test b/mysql-test/main/kill.test similarity index 100% rename from mysql-test/t/kill.test rename to mysql-test/main/kill.test diff --git a/mysql-test/r/kill_processlist-6619.result b/mysql-test/main/kill_processlist-6619.result similarity index 100% rename from mysql-test/r/kill_processlist-6619.result rename to 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 similarity index 100% rename from mysql-test/t/kill_processlist-6619.test rename to 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 similarity index 100% rename from mysql-test/r/kill_query-6728.result rename to 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 similarity index 100% rename from mysql-test/t/kill_query-6728.test rename to mysql-test/main/kill_query-6728.test diff --git a/mysql-test/r/last_value.result b/mysql-test/main/last_value.result similarity index 100% rename from mysql-test/r/last_value.result rename to mysql-test/main/last_value.result diff --git a/mysql-test/t/last_value.test b/mysql-test/main/last_value.test similarity index 100% rename from mysql-test/t/last_value.test rename to mysql-test/main/last_value.test diff --git a/mysql-test/r/limit.result b/mysql-test/main/limit.result similarity index 100% rename from mysql-test/r/limit.result rename to mysql-test/main/limit.result diff --git a/mysql-test/t/limit.test b/mysql-test/main/limit.test similarity index 100% rename from mysql-test/t/limit.test rename to mysql-test/main/limit.test diff --git a/mysql-test/r/limit_rows_examined.result b/mysql-test/main/limit_rows_examined.result similarity index 100% rename from mysql-test/r/limit_rows_examined.result rename to 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 similarity index 100% rename from mysql-test/t/limit_rows_examined.test rename to mysql-test/main/limit_rows_examined.test diff --git a/mysql-test/r/loaddata.result b/mysql-test/main/loaddata.result similarity index 100% rename from mysql-test/r/loaddata.result rename to mysql-test/main/loaddata.result diff --git a/mysql-test/t/loaddata.test b/mysql-test/main/loaddata.test similarity index 100% rename from mysql-test/t/loaddata.test rename to mysql-test/main/loaddata.test diff --git a/mysql-test/r/loaddata_autocom_innodb.result b/mysql-test/main/loaddata_autocom_innodb.result similarity index 100% rename from mysql-test/r/loaddata_autocom_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/loaddata_autocom_innodb.test rename to mysql-test/main/loaddata_autocom_innodb.test diff --git a/mysql-test/r/loadxml.result b/mysql-test/main/loadxml.result similarity index 100% rename from mysql-test/r/loadxml.result rename to mysql-test/main/loadxml.result diff --git a/mysql-test/t/loadxml.test b/mysql-test/main/loadxml.test similarity index 100% rename from mysql-test/t/loadxml.test rename to mysql-test/main/loadxml.test diff --git a/mysql-test/r/locale.result b/mysql-test/main/locale.result similarity index 100% rename from mysql-test/r/locale.result rename to mysql-test/main/locale.result diff --git a/mysql-test/t/locale.test b/mysql-test/main/locale.test similarity index 100% rename from mysql-test/t/locale.test rename to mysql-test/main/locale.test diff --git a/mysql-test/r/lock.result b/mysql-test/main/lock.result similarity index 100% rename from mysql-test/r/lock.result rename to mysql-test/main/lock.result diff --git a/mysql-test/t/lock.test b/mysql-test/main/lock.test similarity index 100% rename from mysql-test/t/lock.test rename to mysql-test/main/lock.test diff --git a/mysql-test/r/lock_multi.result b/mysql-test/main/lock_multi.result similarity index 100% rename from mysql-test/r/lock_multi.result rename to mysql-test/main/lock_multi.result diff --git a/mysql-test/t/lock_multi.test b/mysql-test/main/lock_multi.test similarity index 100% rename from mysql-test/t/lock_multi.test rename to mysql-test/main/lock_multi.test diff --git a/mysql-test/r/lock_multi_bug38499.result b/mysql-test/main/lock_multi_bug38499.result similarity index 100% rename from mysql-test/r/lock_multi_bug38499.result rename to 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 similarity index 100% rename from mysql-test/t/lock_multi_bug38499.test rename to 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 similarity index 100% rename from mysql-test/r/lock_multi_bug38691.result rename to 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 similarity index 100% rename from mysql-test/t/lock_multi_bug38691.test rename to 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 similarity index 100% rename from mysql-test/t/lock_sync-master.opt rename to mysql-test/main/lock_sync-master.opt diff --git a/mysql-test/r/lock_sync.result b/mysql-test/main/lock_sync.result similarity index 100% rename from mysql-test/r/lock_sync.result rename to mysql-test/main/lock_sync.result diff --git a/mysql-test/t/lock_sync.test b/mysql-test/main/lock_sync.test similarity index 100% rename from mysql-test/t/lock_sync.test rename to 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 similarity index 100% rename from mysql-test/t/lock_tables_lost_commit-master.opt rename to 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 similarity index 100% rename from mysql-test/r/lock_tables_lost_commit.result rename to 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 similarity index 100% rename from mysql-test/t/lock_tables_lost_commit.test rename to 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 similarity index 100% rename from mysql-test/r/locked_temporary-5955.result rename to 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 similarity index 100% rename from mysql-test/t/locked_temporary-5955.test rename to mysql-test/main/locked_temporary-5955.test diff --git a/mysql-test/r/log_errchk.result b/mysql-test/main/log_errchk.result similarity index 100% rename from mysql-test/r/log_errchk.result rename to mysql-test/main/log_errchk.result diff --git a/mysql-test/t/log_errchk.test b/mysql-test/main/log_errchk.test similarity index 100% rename from mysql-test/t/log_errchk.test rename to mysql-test/main/log_errchk.test diff --git a/mysql-test/r/log_slow.result b/mysql-test/main/log_slow.result similarity index 100% rename from mysql-test/r/log_slow.result rename to mysql-test/main/log_slow.result diff --git a/mysql-test/t/log_slow.test b/mysql-test/main/log_slow.test similarity index 100% rename from mysql-test/t/log_slow.test rename to mysql-test/main/log_slow.test diff --git a/mysql-test/t/log_state-master.opt b/mysql-test/main/log_state-master.opt similarity index 100% rename from mysql-test/t/log_state-master.opt rename to mysql-test/main/log_state-master.opt diff --git a/mysql-test/r/log_state.result b/mysql-test/main/log_state.result similarity index 100% rename from mysql-test/r/log_state.result rename to mysql-test/main/log_state.result diff --git a/mysql-test/t/log_state.test b/mysql-test/main/log_state.test similarity index 100% rename from mysql-test/t/log_state.test rename to 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 similarity index 100% rename from mysql-test/t/log_state_bug33693-master.opt rename to 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 similarity index 100% rename from mysql-test/r/log_state_bug33693.result rename to 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 similarity index 100% rename from mysql-test/t/log_state_bug33693.test rename to 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 similarity index 100% rename from mysql-test/t/log_tables-big-master.opt rename to 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 similarity index 100% rename from mysql-test/r/log_tables-big.result rename to 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 similarity index 100% rename from mysql-test/t/log_tables-big.test rename to 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 similarity index 100% rename from mysql-test/t/log_tables-master.opt rename to mysql-test/main/log_tables-master.opt diff --git a/mysql-test/r/log_tables.result b/mysql-test/main/log_tables.result similarity index 100% rename from mysql-test/r/log_tables.result rename to mysql-test/main/log_tables.result diff --git a/mysql-test/t/log_tables.test b/mysql-test/main/log_tables.test similarity index 100% rename from mysql-test/t/log_tables.test rename to mysql-test/main/log_tables.test diff --git a/mysql-test/r/log_tables_debug.result b/mysql-test/main/log_tables_debug.result similarity index 100% rename from mysql-test/r/log_tables_debug.result rename to 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 similarity index 100% rename from mysql-test/t/log_tables_debug.test rename to 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 similarity index 100% rename from mysql-test/r/log_tables_upgrade.result rename to 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 similarity index 100% rename from mysql-test/t/log_tables_upgrade.test rename to 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 similarity index 100% rename from mysql-test/t/long_tmpdir-master.opt rename to 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 similarity index 100% rename from mysql-test/t/long_tmpdir-master.sh rename to mysql-test/main/long_tmpdir-master.sh diff --git a/mysql-test/r/long_tmpdir.result b/mysql-test/main/long_tmpdir.result similarity index 100% rename from mysql-test/r/long_tmpdir.result rename to mysql-test/main/long_tmpdir.result diff --git a/mysql-test/t/long_tmpdir.test b/mysql-test/main/long_tmpdir.test similarity index 100% rename from mysql-test/t/long_tmpdir.test rename to mysql-test/main/long_tmpdir.test diff --git a/mysql-test/r/lowercase_fs_off.result b/mysql-test/main/lowercase_fs_off.result similarity index 100% rename from mysql-test/r/lowercase_fs_off.result rename to 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 similarity index 100% rename from mysql-test/t/lowercase_fs_off.test rename to 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 similarity index 100% rename from mysql-test/r/lowercase_fs_on.result rename to 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 similarity index 100% rename from mysql-test/t/lowercase_fs_on.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_mixed_tmpdir-master.opt rename to 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 similarity index 100% rename from mysql-test/t/lowercase_mixed_tmpdir-master.sh rename to 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 similarity index 100% rename from mysql-test/r/lowercase_mixed_tmpdir.result rename to 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 similarity index 100% rename from mysql-test/t/lowercase_mixed_tmpdir.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_mixed_tmpdir_innodb-master.opt rename to 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 similarity index 100% rename from mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh rename to 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 similarity index 100% rename from mysql-test/r/lowercase_mixed_tmpdir_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/lowercase_mixed_tmpdir_innodb.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_table-master.opt rename to mysql-test/main/lowercase_table-master.opt diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/main/lowercase_table.result similarity index 100% rename from mysql-test/r/lowercase_table.result rename to mysql-test/main/lowercase_table.result diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/main/lowercase_table.test similarity index 100% rename from mysql-test/t/lowercase_table.test rename to mysql-test/main/lowercase_table.test diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/main/lowercase_table2.result similarity index 100% rename from mysql-test/r/lowercase_table2.result rename to mysql-test/main/lowercase_table2.result diff --git a/mysql-test/t/lowercase_table2.test b/mysql-test/main/lowercase_table2.test similarity index 99% rename from mysql-test/t/lowercase_table2.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_table4-master.opt rename to mysql-test/main/lowercase_table4-master.opt diff --git a/mysql-test/r/lowercase_table4.result b/mysql-test/main/lowercase_table4.result similarity index 100% rename from mysql-test/r/lowercase_table4.result rename to mysql-test/main/lowercase_table4.result diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/main/lowercase_table4.test similarity index 100% rename from mysql-test/t/lowercase_table4.test rename to mysql-test/main/lowercase_table4.test diff --git a/mysql-test/r/lowercase_table5.result b/mysql-test/main/lowercase_table5.result similarity index 100% rename from mysql-test/r/lowercase_table5.result rename to mysql-test/main/lowercase_table5.result diff --git a/mysql-test/t/lowercase_table5.test b/mysql-test/main/lowercase_table5.test similarity index 100% rename from mysql-test/t/lowercase_table5.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_table_grant-master.opt rename to 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 similarity index 100% rename from mysql-test/r/lowercase_table_grant.result rename to 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 similarity index 100% rename from mysql-test/t/lowercase_table_grant.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_table_qcache-master.opt rename to 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 similarity index 100% rename from mysql-test/r/lowercase_table_qcache.result rename to 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 similarity index 100% rename from mysql-test/t/lowercase_table_qcache.test rename to 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 similarity index 100% rename from mysql-test/t/lowercase_utf8-master.opt rename to mysql-test/main/lowercase_utf8-master.opt diff --git a/mysql-test/r/lowercase_utf8.result b/mysql-test/main/lowercase_utf8.result similarity index 100% rename from mysql-test/r/lowercase_utf8.result rename to mysql-test/main/lowercase_utf8.result diff --git a/mysql-test/t/lowercase_utf8.test b/mysql-test/main/lowercase_utf8.test similarity index 100% rename from mysql-test/t/lowercase_utf8.test rename to mysql-test/main/lowercase_utf8.test diff --git a/mysql-test/t/lowercase_view-master.opt b/mysql-test/main/lowercase_view-master.opt similarity index 100% rename from mysql-test/t/lowercase_view-master.opt rename to mysql-test/main/lowercase_view-master.opt diff --git a/mysql-test/r/lowercase_view.result b/mysql-test/main/lowercase_view.result similarity index 100% rename from mysql-test/r/lowercase_view.result rename to mysql-test/main/lowercase_view.result diff --git a/mysql-test/t/lowercase_view.test b/mysql-test/main/lowercase_view.test similarity index 100% rename from mysql-test/t/lowercase_view.test rename to mysql-test/main/lowercase_view.test diff --git a/mysql-test/r/max_statement_time.result b/mysql-test/main/max_statement_time.result similarity index 100% rename from mysql-test/r/max_statement_time.result rename to 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 similarity index 100% rename from mysql-test/t/max_statement_time.test rename to mysql-test/main/max_statement_time.test diff --git a/mysql-test/r/mdev-504.result b/mysql-test/main/mdev-504.result similarity index 100% rename from mysql-test/r/mdev-504.result rename to mysql-test/main/mdev-504.result diff --git a/mysql-test/t/mdev-504.test b/mysql-test/main/mdev-504.test similarity index 100% rename from mysql-test/t/mdev-504.test rename to mysql-test/main/mdev-504.test diff --git a/mysql-test/r/mdev13607.result b/mysql-test/main/mdev13607.result similarity index 100% rename from mysql-test/r/mdev13607.result rename to mysql-test/main/mdev13607.result diff --git a/mysql-test/t/mdev13607.test b/mysql-test/main/mdev13607.test similarity index 100% rename from mysql-test/t/mdev13607.test rename to mysql-test/main/mdev13607.test diff --git a/mysql-test/r/mdev316.result b/mysql-test/main/mdev316.result similarity index 100% rename from mysql-test/r/mdev316.result rename to mysql-test/main/mdev316.result diff --git a/mysql-test/t/mdev316.test b/mysql-test/main/mdev316.test similarity index 100% rename from mysql-test/t/mdev316.test rename to mysql-test/main/mdev316.test diff --git a/mysql-test/r/mdev375.result b/mysql-test/main/mdev375.result similarity index 100% rename from mysql-test/r/mdev375.result rename to mysql-test/main/mdev375.result diff --git a/mysql-test/t/mdev375.test b/mysql-test/main/mdev375.test similarity index 100% rename from mysql-test/t/mdev375.test rename to mysql-test/main/mdev375.test diff --git a/mysql-test/r/mdev6830.result b/mysql-test/main/mdev6830.result similarity index 100% rename from mysql-test/r/mdev6830.result rename to mysql-test/main/mdev6830.result diff --git a/mysql-test/t/mdev6830.test b/mysql-test/main/mdev6830.test similarity index 100% rename from mysql-test/t/mdev6830.test rename to mysql-test/main/mdev6830.test diff --git a/mysql-test/r/mdev_14586.result b/mysql-test/main/mdev_14586.result similarity index 100% rename from mysql-test/r/mdev_14586.result rename to mysql-test/main/mdev_14586.result diff --git a/mysql-test/t/mdev_14586.test b/mysql-test/main/mdev_14586.test similarity index 100% rename from mysql-test/t/mdev_14586.test rename to mysql-test/main/mdev_14586.test diff --git a/mysql-test/r/mdl.result b/mysql-test/main/mdl.result similarity index 100% rename from mysql-test/r/mdl.result rename to mysql-test/main/mdl.result diff --git a/mysql-test/t/mdl.test b/mysql-test/main/mdl.test similarity index 100% rename from mysql-test/t/mdl.test rename to mysql-test/main/mdl.test diff --git a/mysql-test/t/mdl_sync-master.opt b/mysql-test/main/mdl_sync-master.opt similarity index 100% rename from mysql-test/t/mdl_sync-master.opt rename to mysql-test/main/mdl_sync-master.opt diff --git a/mysql-test/r/mdl_sync.result b/mysql-test/main/mdl_sync.result similarity index 100% rename from mysql-test/r/mdl_sync.result rename to mysql-test/main/mdl_sync.result diff --git a/mysql-test/t/mdl_sync.test b/mysql-test/main/mdl_sync.test similarity index 100% rename from mysql-test/t/mdl_sync.test rename to mysql-test/main/mdl_sync.test diff --git a/mysql-test/r/merge-big.result b/mysql-test/main/merge-big.result similarity index 100% rename from mysql-test/r/merge-big.result rename to mysql-test/main/merge-big.result diff --git a/mysql-test/t/merge-big.test b/mysql-test/main/merge-big.test similarity index 100% rename from mysql-test/t/merge-big.test rename to mysql-test/main/merge-big.test diff --git a/mysql-test/r/merge.result b/mysql-test/main/merge.result similarity index 100% rename from mysql-test/r/merge.result rename to mysql-test/main/merge.result diff --git a/mysql-test/t/merge.test b/mysql-test/main/merge.test similarity index 100% rename from mysql-test/t/merge.test rename to mysql-test/main/merge.test diff --git a/mysql-test/r/merge_debug.result b/mysql-test/main/merge_debug.result similarity index 100% rename from mysql-test/r/merge_debug.result rename to mysql-test/main/merge_debug.result diff --git a/mysql-test/t/merge_debug.test b/mysql-test/main/merge_debug.test similarity index 100% rename from mysql-test/t/merge_debug.test rename to mysql-test/main/merge_debug.test diff --git a/mysql-test/r/merge_innodb.result b/mysql-test/main/merge_innodb.result similarity index 100% rename from mysql-test/r/merge_innodb.result rename to mysql-test/main/merge_innodb.result diff --git a/mysql-test/t/merge_innodb.test b/mysql-test/main/merge_innodb.test similarity index 100% rename from mysql-test/t/merge_innodb.test rename to mysql-test/main/merge_innodb.test diff --git a/mysql-test/t/merge_mmap-master.opt b/mysql-test/main/merge_mmap-master.opt similarity index 100% rename from mysql-test/t/merge_mmap-master.opt rename to mysql-test/main/merge_mmap-master.opt diff --git a/mysql-test/r/merge_mmap.result b/mysql-test/main/merge_mmap.result similarity index 100% rename from mysql-test/r/merge_mmap.result rename to mysql-test/main/merge_mmap.result diff --git a/mysql-test/t/merge_mmap.test b/mysql-test/main/merge_mmap.test similarity index 100% rename from mysql-test/t/merge_mmap.test rename to mysql-test/main/merge_mmap.test diff --git a/mysql-test/r/metadata.result b/mysql-test/main/metadata.result similarity index 100% rename from mysql-test/r/metadata.result rename to mysql-test/main/metadata.result diff --git a/mysql-test/t/metadata.test b/mysql-test/main/metadata.test similarity index 100% rename from mysql-test/t/metadata.test rename to mysql-test/main/metadata.test diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/main/mix2_myisam.result similarity index 100% rename from mysql-test/r/mix2_myisam.result rename to mysql-test/main/mix2_myisam.result diff --git a/mysql-test/t/mix2_myisam.test b/mysql-test/main/mix2_myisam.test similarity index 100% rename from mysql-test/t/mix2_myisam.test rename to mysql-test/main/mix2_myisam.test diff --git a/mysql-test/r/mix2_myisam_ucs2.result b/mysql-test/main/mix2_myisam_ucs2.result similarity index 100% rename from mysql-test/r/mix2_myisam_ucs2.result rename to 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 similarity index 100% rename from mysql-test/t/mix2_myisam_ucs2.test rename to 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 similarity index 100% rename from mysql-test/r/mrr_derived_crash_4610.result rename to 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 similarity index 100% rename from mysql-test/t/mrr_derived_crash_4610.test rename to 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 similarity index 100% rename from mysql-test/r/mrr_icp_extra.result rename to 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 similarity index 100% rename from mysql-test/t/mrr_icp_extra.test rename to 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 similarity index 100% rename from mysql-test/t/multi_statement-master.opt rename to mysql-test/main/multi_statement-master.opt diff --git a/mysql-test/r/multi_statement.result b/mysql-test/main/multi_statement.result similarity index 100% rename from mysql-test/r/multi_statement.result rename to mysql-test/main/multi_statement.result diff --git a/mysql-test/t/multi_statement.test b/mysql-test/main/multi_statement.test similarity index 100% rename from mysql-test/t/multi_statement.test rename to mysql-test/main/multi_statement.test diff --git a/mysql-test/t/multi_update-master.opt b/mysql-test/main/multi_update-master.opt similarity index 100% rename from mysql-test/t/multi_update-master.opt rename to mysql-test/main/multi_update-master.opt diff --git a/mysql-test/r/multi_update.result b/mysql-test/main/multi_update.result similarity index 100% rename from mysql-test/r/multi_update.result rename to mysql-test/main/multi_update.result diff --git a/mysql-test/t/multi_update.test b/mysql-test/main/multi_update.test similarity index 100% rename from mysql-test/t/multi_update.test rename to mysql-test/main/multi_update.test diff --git a/mysql-test/t/multi_update2-master.opt b/mysql-test/main/multi_update2-master.opt similarity index 100% rename from mysql-test/t/multi_update2-master.opt rename to mysql-test/main/multi_update2-master.opt diff --git a/mysql-test/r/multi_update2.result b/mysql-test/main/multi_update2.result similarity index 100% rename from mysql-test/r/multi_update2.result rename to mysql-test/main/multi_update2.result diff --git a/mysql-test/t/multi_update2.test b/mysql-test/main/multi_update2.test similarity index 100% rename from mysql-test/t/multi_update2.test rename to mysql-test/main/multi_update2.test diff --git a/mysql-test/r/multi_update_binlog.result b/mysql-test/main/multi_update_binlog.result similarity index 100% rename from mysql-test/r/multi_update_binlog.result rename to 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 similarity index 100% rename from mysql-test/t/multi_update_binlog.test rename to 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 similarity index 100% rename from mysql-test/r/multi_update_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/multi_update_innodb.test rename to 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 similarity index 100% rename from mysql-test/t/multi_update_tiny_hash-master.opt rename to 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 similarity index 100% rename from mysql-test/r/multi_update_tiny_hash.result rename to 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 similarity index 100% rename from mysql-test/t/multi_update_tiny_hash.test rename to mysql-test/main/multi_update_tiny_hash.test diff --git a/mysql-test/r/myisam-big.result b/mysql-test/main/myisam-big.result similarity index 100% rename from mysql-test/r/myisam-big.result rename to mysql-test/main/myisam-big.result diff --git a/mysql-test/t/myisam-big.test b/mysql-test/main/myisam-big.test similarity index 100% rename from mysql-test/t/myisam-big.test rename to mysql-test/main/myisam-big.test diff --git a/mysql-test/t/myisam-blob-master.opt b/mysql-test/main/myisam-blob-master.opt similarity index 100% rename from mysql-test/t/myisam-blob-master.opt rename to mysql-test/main/myisam-blob-master.opt diff --git a/mysql-test/r/myisam-blob.result b/mysql-test/main/myisam-blob.result similarity index 100% rename from mysql-test/r/myisam-blob.result rename to mysql-test/main/myisam-blob.result diff --git a/mysql-test/t/myisam-blob.test b/mysql-test/main/myisam-blob.test similarity index 100% rename from mysql-test/t/myisam-blob.test rename to mysql-test/main/myisam-blob.test diff --git a/mysql-test/t/myisam-master.opt b/mysql-test/main/myisam-master.opt similarity index 100% rename from mysql-test/t/myisam-master.opt rename to mysql-test/main/myisam-master.opt diff --git a/mysql-test/r/myisam-optimize.result b/mysql-test/main/myisam-optimize.result similarity index 100% rename from mysql-test/r/myisam-optimize.result rename to mysql-test/main/myisam-optimize.result diff --git a/mysql-test/t/myisam-optimize.test b/mysql-test/main/myisam-optimize.test similarity index 100% rename from mysql-test/t/myisam-optimize.test rename to mysql-test/main/myisam-optimize.test diff --git a/mysql-test/r/myisam-system.result b/mysql-test/main/myisam-system.result similarity index 100% rename from mysql-test/r/myisam-system.result rename to mysql-test/main/myisam-system.result diff --git a/mysql-test/t/myisam-system.test b/mysql-test/main/myisam-system.test similarity index 100% rename from mysql-test/t/myisam-system.test rename to mysql-test/main/myisam-system.test diff --git a/mysql-test/r/myisam.result b/mysql-test/main/myisam.result similarity index 100% rename from mysql-test/r/myisam.result rename to mysql-test/main/myisam.result diff --git a/mysql-test/t/myisam.test b/mysql-test/main/myisam.test similarity index 100% rename from mysql-test/t/myisam.test rename to 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 similarity index 100% rename from mysql-test/t/myisam_crash_before_flush_keys-master.opt rename to 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 similarity index 100% rename from mysql-test/r/myisam_crash_before_flush_keys.result rename to 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 similarity index 100% rename from mysql-test/t/myisam_crash_before_flush_keys.test rename to 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 similarity index 100% rename from mysql-test/r/myisam_debug.result rename to mysql-test/main/myisam_debug.result diff --git a/mysql-test/t/myisam_debug.test b/mysql-test/main/myisam_debug.test similarity index 100% rename from mysql-test/t/myisam_debug.test rename to 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 similarity index 100% rename from mysql-test/r/myisam_enable_keys-10506.result rename to 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 similarity index 100% rename from mysql-test/t/myisam_enable_keys-10506.test rename to 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 similarity index 100% rename from mysql-test/r/myisam_explain_non_select_all.result rename to 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 similarity index 100% rename from mysql-test/t/myisam_explain_non_select_all.test rename to 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 similarity index 100% rename from mysql-test/r/myisam_icp.result rename to mysql-test/main/myisam_icp.result diff --git a/mysql-test/t/myisam_icp.test b/mysql-test/main/myisam_icp.test similarity index 100% rename from mysql-test/t/myisam_icp.test rename to mysql-test/main/myisam_icp.test diff --git a/mysql-test/r/myisam_icp_notembedded.result b/mysql-test/main/myisam_icp_notembedded.result similarity index 100% rename from mysql-test/r/myisam_icp_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/myisam_icp_notembedded.test rename to mysql-test/main/myisam_icp_notembedded.test diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/main/myisam_mrr.result similarity index 100% rename from mysql-test/r/myisam_mrr.result rename to mysql-test/main/myisam_mrr.result diff --git a/mysql-test/t/myisam_mrr.test b/mysql-test/main/myisam_mrr.test similarity index 100% rename from mysql-test/t/myisam_mrr.test rename to mysql-test/main/myisam_mrr.test diff --git a/mysql-test/r/myisam_optimize.result b/mysql-test/main/myisam_optimize.result similarity index 100% rename from mysql-test/r/myisam_optimize.result rename to mysql-test/main/myisam_optimize.result diff --git a/mysql-test/t/myisam_optimize.test b/mysql-test/main/myisam_optimize.test similarity index 100% rename from mysql-test/t/myisam_optimize.test rename to mysql-test/main/myisam_optimize.test diff --git a/mysql-test/t/myisam_recover-master.opt b/mysql-test/main/myisam_recover-master.opt similarity index 100% rename from mysql-test/t/myisam_recover-master.opt rename to mysql-test/main/myisam_recover-master.opt diff --git a/mysql-test/r/myisam_recover.result b/mysql-test/main/myisam_recover.result similarity index 100% rename from mysql-test/r/myisam_recover.result rename to mysql-test/main/myisam_recover.result diff --git a/mysql-test/t/myisam_recover.test b/mysql-test/main/myisam_recover.test similarity index 100% rename from mysql-test/t/myisam_recover.test rename to mysql-test/main/myisam_recover.test diff --git a/mysql-test/r/myisampack.result b/mysql-test/main/myisampack.result similarity index 100% rename from mysql-test/r/myisampack.result rename to mysql-test/main/myisampack.result diff --git a/mysql-test/t/myisampack.test b/mysql-test/main/myisampack.test similarity index 100% rename from mysql-test/t/myisampack.test rename to mysql-test/main/myisampack.test diff --git a/mysql-test/r/mysql-bug41486.result b/mysql-test/main/mysql-bug41486.result similarity index 100% rename from mysql-test/r/mysql-bug41486.result rename to mysql-test/main/mysql-bug41486.result diff --git a/mysql-test/t/mysql-bug41486.test b/mysql-test/main/mysql-bug41486.test similarity index 100% rename from mysql-test/t/mysql-bug41486.test rename to mysql-test/main/mysql-bug41486.test diff --git a/mysql-test/r/mysql-bug45236.result b/mysql-test/main/mysql-bug45236.result similarity index 100% rename from mysql-test/r/mysql-bug45236.result rename to mysql-test/main/mysql-bug45236.result diff --git a/mysql-test/t/mysql-bug45236.test b/mysql-test/main/mysql-bug45236.test similarity index 100% rename from mysql-test/t/mysql-bug45236.test rename to mysql-test/main/mysql-bug45236.test diff --git a/mysql-test/r/mysql.result b/mysql-test/main/mysql.result similarity index 100% rename from mysql-test/r/mysql.result rename to mysql-test/main/mysql.result diff --git a/mysql-test/t/mysql.test b/mysql-test/main/mysql.test similarity index 99% rename from mysql-test/t/mysql.test rename to 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 similarity index 100% rename from mysql-test/r/mysql5613mysql.result rename to mysql-test/main/mysql5613mysql.result diff --git a/mysql-test/t/mysql5613mysql.test b/mysql-test/main/mysql5613mysql.test similarity index 100% rename from mysql-test/t/mysql5613mysql.test rename to mysql-test/main/mysql5613mysql.test diff --git a/mysql-test/r/mysql57_virtual.result b/mysql-test/main/mysql57_virtual.result similarity index 100% rename from mysql-test/r/mysql57_virtual.result rename to mysql-test/main/mysql57_virtual.result diff --git a/mysql-test/t/mysql57_virtual.test b/mysql-test/main/mysql57_virtual.test similarity index 100% rename from mysql-test/t/mysql57_virtual.test rename to mysql-test/main/mysql57_virtual.test diff --git a/mysql-test/r/mysql_binary_mode.result b/mysql-test/main/mysql_binary_mode.result similarity index 100% rename from mysql-test/r/mysql_binary_mode.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_binary_mode.test rename to 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 similarity index 100% rename from mysql-test/t/mysql_client_test-master.opt rename to 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 similarity index 100% rename from mysql-test/r/mysql_client_test.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_client_test.test rename to 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 similarity index 100% rename from mysql-test/t/mysql_client_test_comp-master.opt rename to 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 similarity index 100% rename from mysql-test/r/mysql_client_test_comp.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_client_test_comp.test rename to 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 similarity index 100% rename from mysql-test/t/mysql_client_test_nonblock-master.opt rename to 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 similarity index 100% rename from mysql-test/r/mysql_client_test_nonblock.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_client_test_nonblock.test rename to mysql-test/main/mysql_client_test_nonblock.test diff --git a/mysql-test/r/mysql_comments.result b/mysql-test/main/mysql_comments.result similarity index 100% rename from mysql-test/r/mysql_comments.result rename to mysql-test/main/mysql_comments.result diff --git a/mysql-test/t/mysql_comments.sql b/mysql-test/main/mysql_comments.sql similarity index 100% rename from mysql-test/t/mysql_comments.sql rename to mysql-test/main/mysql_comments.sql diff --git a/mysql-test/t/mysql_comments.test b/mysql-test/main/mysql_comments.test similarity index 91% rename from mysql-test/t/mysql_comments.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_cp932.result rename to mysql-test/main/mysql_cp932.result diff --git a/mysql-test/t/mysql_cp932.test b/mysql-test/main/mysql_cp932.test similarity index 100% rename from mysql-test/t/mysql_cp932.test rename to mysql-test/main/mysql_cp932.test diff --git a/mysql-test/t/mysql_delimiter.sql b/mysql-test/main/mysql_delimiter.sql similarity index 94% rename from mysql-test/t/mysql_delimiter.sql rename to 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 similarity index 100% rename from mysql-test/t/mysql_delimiter_19799.sql rename to 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 similarity index 100% rename from mysql-test/t/mysql_delimiter_source.sql rename to mysql-test/main/mysql_delimiter_source.sql diff --git a/mysql-test/r/mysql_embedded.result b/mysql-test/main/mysql_embedded.result similarity index 100% rename from mysql-test/r/mysql_embedded.result rename to mysql-test/main/mysql_embedded.result diff --git a/mysql-test/t/mysql_embedded.test b/mysql-test/main/mysql_embedded.test similarity index 100% rename from mysql-test/t/mysql_embedded.test rename to mysql-test/main/mysql_embedded.test diff --git a/mysql-test/r/mysql_locale_posix.result b/mysql-test/main/mysql_locale_posix.result similarity index 100% rename from mysql-test/r/mysql_locale_posix.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_locale_posix.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_not_windows.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_not_windows.test rename to mysql-test/main/mysql_not_windows.test diff --git a/mysql-test/r/mysql_protocols.result b/mysql-test/main/mysql_protocols.result similarity index 100% rename from mysql-test/r/mysql_protocols.result rename to mysql-test/main/mysql_protocols.result diff --git a/mysql-test/t/mysql_protocols.test b/mysql-test/main/mysql_protocols.test similarity index 100% rename from mysql-test/t/mysql_protocols.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_tzinfo_to_sql_symlink.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_tzinfo_to_sql_symlink.test rename to 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 similarity index 100% rename from mysql-test/t/mysql_upgrade-6984.opt rename to 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 similarity index 100% rename from mysql-test/r/mysql_upgrade-6984.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_upgrade-6984.test rename to mysql-test/main/mysql_upgrade-6984.test diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result similarity index 100% rename from mysql-test/r/mysql_upgrade.result rename to mysql-test/main/mysql_upgrade.result diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test similarity index 100% rename from mysql-test/t/mysql_upgrade.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_upgrade_no_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_upgrade_no_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_upgrade_noengine.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_upgrade_noengine.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_upgrade_ssl.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_upgrade_ssl.test rename to 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 similarity index 100% rename from mysql-test/r/mysql_upgrade_view.result rename to 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 similarity index 100% rename from mysql-test/t/mysql_upgrade_view.test rename to mysql-test/main/mysql_upgrade_view.test diff --git a/mysql-test/r/mysqladmin.result b/mysql-test/main/mysqladmin.result similarity index 100% rename from mysql-test/r/mysqladmin.result rename to mysql-test/main/mysqladmin.result diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/main/mysqladmin.test similarity index 100% rename from mysql-test/t/mysqladmin.test rename to mysql-test/main/mysqladmin.test diff --git a/mysql-test/r/mysqlbinlog-innodb.result b/mysql-test/main/mysqlbinlog-innodb.result similarity index 100% rename from mysql-test/r/mysqlbinlog-innodb.result rename to mysql-test/main/mysqlbinlog-innodb.result diff --git a/mysql-test/t/mysqlbinlog-innodb.test b/mysql-test/main/mysqlbinlog-innodb.test similarity index 100% rename from mysql-test/t/mysqlbinlog-innodb.test rename to mysql-test/main/mysqlbinlog-innodb.test diff --git a/mysql-test/t/mysqlbinlog-master.opt b/mysql-test/main/mysqlbinlog-master.opt similarity index 100% rename from mysql-test/t/mysqlbinlog-master.opt rename to mysql-test/main/mysqlbinlog-master.opt diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result similarity index 100% rename from mysql-test/r/mysqlbinlog.result rename to mysql-test/main/mysqlbinlog.result diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/main/mysqlbinlog.test similarity index 100% rename from mysql-test/t/mysqlbinlog.test rename to mysql-test/main/mysqlbinlog.test diff --git a/mysql-test/r/mysqlbinlog_raw_mode.result b/mysql-test/main/mysqlbinlog_raw_mode.result similarity index 100% rename from mysql-test/r/mysqlbinlog_raw_mode.result rename to 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 similarity index 100% rename from mysql-test/t/mysqlbinlog_raw_mode.test rename to 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 similarity index 100% rename from mysql-test/r/mysqlbinlog_row_big.result rename to 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 similarity index 100% rename from mysql-test/t/mysqlbinlog_row_big.test rename to 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 similarity index 100% rename from mysql-test/r/mysqlbinlog_row_compressed.result rename to 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 similarity index 100% rename from mysql-test/t/mysqlbinlog_row_compressed.test rename to 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 similarity index 100% rename from mysql-test/t/mysqlbinlog_row_minimal.opt rename to 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 similarity index 100% rename from mysql-test/r/mysqlbinlog_row_minimal.result rename to 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 similarity index 100% rename from mysql-test/t/mysqlbinlog_row_minimal.test rename to 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 similarity index 100% rename from mysql-test/r/mysqlbinlog_stmt_compressed.result rename to 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 similarity index 100% rename from mysql-test/t/mysqlbinlog_stmt_compressed.test rename to mysql-test/main/mysqlbinlog_stmt_compressed.test diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/main/mysqlcheck.result similarity index 100% rename from mysql-test/r/mysqlcheck.result rename to mysql-test/main/mysqlcheck.result diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/main/mysqlcheck.test similarity index 100% rename from mysql-test/t/mysqlcheck.test rename to mysql-test/main/mysqlcheck.test diff --git a/mysql-test/r/mysqld--defaults-file.result b/mysql-test/main/mysqld--defaults-file.result similarity index 100% rename from mysql-test/r/mysqld--defaults-file.result rename to 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 similarity index 100% rename from mysql-test/t/mysqld--defaults-file.test rename to 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 similarity index 100% rename from mysql-test/r/mysqld--help,win.rdiff rename to mysql-test/main/mysqld--help,win.rdiff diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/main/mysqld--help.result similarity index 100% rename from mysql-test/r/mysqld--help.result rename to mysql-test/main/mysqld--help.result diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/main/mysqld--help.test similarity index 100% rename from mysql-test/t/mysqld--help.test rename to 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 similarity index 100% rename from mysql-test/r/mysqld_help_crash-9183.result rename to 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 similarity index 100% rename from mysql-test/t/mysqld_help_crash-9183.test rename to 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 similarity index 100% rename from mysql-test/r/mysqld_option_err.result rename to 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 similarity index 100% rename from mysql-test/t/mysqld_option_err.test rename to mysql-test/main/mysqld_option_err.test diff --git a/mysql-test/t/mysqldump-compat.opt b/mysql-test/main/mysqldump-compat.opt similarity index 100% rename from mysql-test/t/mysqldump-compat.opt rename to mysql-test/main/mysqldump-compat.opt diff --git a/mysql-test/r/mysqldump-compat.result b/mysql-test/main/mysqldump-compat.result similarity index 100% rename from mysql-test/r/mysqldump-compat.result rename to mysql-test/main/mysqldump-compat.result diff --git a/mysql-test/t/mysqldump-compat.test b/mysql-test/main/mysqldump-compat.test similarity index 100% rename from mysql-test/t/mysqldump-compat.test rename to mysql-test/main/mysqldump-compat.test diff --git a/mysql-test/t/mysqldump-max-master.opt b/mysql-test/main/mysqldump-max-master.opt similarity index 100% rename from mysql-test/t/mysqldump-max-master.opt rename to mysql-test/main/mysqldump-max-master.opt diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/main/mysqldump-max.result similarity index 100% rename from mysql-test/r/mysqldump-max.result rename to mysql-test/main/mysqldump-max.result diff --git a/mysql-test/t/mysqldump-max.test b/mysql-test/main/mysqldump-max.test similarity index 100% rename from mysql-test/t/mysqldump-max.test rename to mysql-test/main/mysqldump-max.test diff --git a/mysql-test/r/mysqldump-nl.result b/mysql-test/main/mysqldump-nl.result similarity index 100% rename from mysql-test/r/mysqldump-nl.result rename to mysql-test/main/mysqldump-nl.result diff --git a/mysql-test/t/mysqldump-nl.test b/mysql-test/main/mysqldump-nl.test similarity index 100% rename from mysql-test/t/mysqldump-nl.test rename to 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 similarity index 100% rename from mysql-test/t/mysqldump-no-binlog-master.opt rename to 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 similarity index 100% rename from mysql-test/r/mysqldump-no-binlog.result rename to 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 similarity index 100% rename from mysql-test/t/mysqldump-no-binlog.test rename to mysql-test/main/mysqldump-no-binlog.test diff --git a/mysql-test/r/mysqldump.result b/mysql-test/main/mysqldump.result similarity index 100% rename from mysql-test/r/mysqldump.result rename to mysql-test/main/mysqldump.result diff --git a/mysql-test/t/mysqldump.test b/mysql-test/main/mysqldump.test similarity index 100% rename from mysql-test/t/mysqldump.test rename to mysql-test/main/mysqldump.test diff --git a/mysql-test/r/mysqldump_restore.result b/mysql-test/main/mysqldump_restore.result similarity index 100% rename from mysql-test/r/mysqldump_restore.result rename to mysql-test/main/mysqldump_restore.result diff --git a/mysql-test/t/mysqldump_restore.test b/mysql-test/main/mysqldump_restore.test similarity index 100% rename from mysql-test/t/mysqldump_restore.test rename to mysql-test/main/mysqldump_restore.test diff --git a/mysql-test/r/mysqlhotcopy_myisam.result b/mysql-test/main/mysqlhotcopy_myisam.result similarity index 100% rename from mysql-test/r/mysqlhotcopy_myisam.result rename to mysql-test/main/mysqlhotcopy_myisam.result diff --git a/mysql-test/t/mysqlhotcopy_myisam.test b/mysql-test/main/mysqlhotcopy_myisam.test similarity index 100% rename from mysql-test/t/mysqlhotcopy_myisam.test rename to mysql-test/main/mysqlhotcopy_myisam.test diff --git a/mysql-test/r/mysqlshow.result b/mysql-test/main/mysqlshow.result similarity index 100% rename from mysql-test/r/mysqlshow.result rename to mysql-test/main/mysqlshow.result diff --git a/mysql-test/t/mysqlshow.test b/mysql-test/main/mysqlshow.test similarity index 100% rename from mysql-test/t/mysqlshow.test rename to mysql-test/main/mysqlshow.test diff --git a/mysql-test/t/mysqlslap.opt b/mysql-test/main/mysqlslap.opt similarity index 100% rename from mysql-test/t/mysqlslap.opt rename to mysql-test/main/mysqlslap.opt diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/main/mysqlslap.result similarity index 100% rename from mysql-test/r/mysqlslap.result rename to mysql-test/main/mysqlslap.result diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/main/mysqlslap.test similarity index 100% rename from mysql-test/t/mysqlslap.test rename to mysql-test/main/mysqlslap.test diff --git a/mysql-test/r/mysqltest.result b/mysql-test/main/mysqltest.result similarity index 100% rename from mysql-test/r/mysqltest.result rename to mysql-test/main/mysqltest.result diff --git a/mysql-test/t/mysqltest.test b/mysql-test/main/mysqltest.test similarity index 100% rename from mysql-test/t/mysqltest.test rename to mysql-test/main/mysqltest.test diff --git a/mysql-test/r/mysqltest_256.result b/mysql-test/main/mysqltest_256.result similarity index 100% rename from mysql-test/r/mysqltest_256.result rename to mysql-test/main/mysqltest_256.result diff --git a/mysql-test/t/mysqltest_256.test b/mysql-test/main/mysqltest_256.test similarity index 100% rename from mysql-test/t/mysqltest_256.test rename to 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 similarity index 100% rename from mysql-test/r/mysqltest_cont_on_error.result rename to 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 similarity index 100% rename from mysql-test/t/mysqltest_cont_on_error.test rename to mysql-test/main/mysqltest_cont_on_error.test diff --git a/mysql-test/r/mysqltest_ps.result b/mysql-test/main/mysqltest_ps.result similarity index 100% rename from mysql-test/r/mysqltest_ps.result rename to mysql-test/main/mysqltest_ps.result diff --git a/mysql-test/t/mysqltest_ps.test b/mysql-test/main/mysqltest_ps.test similarity index 100% rename from mysql-test/t/mysqltest_ps.test rename to mysql-test/main/mysqltest_ps.test diff --git a/mysql-test/t/named_pipe-master.opt b/mysql-test/main/named_pipe-master.opt similarity index 100% rename from mysql-test/t/named_pipe-master.opt rename to mysql-test/main/named_pipe-master.opt diff --git a/mysql-test/r/named_pipe.result b/mysql-test/main/named_pipe.result similarity index 100% rename from mysql-test/r/named_pipe.result rename to mysql-test/main/named_pipe.result diff --git a/mysql-test/t/named_pipe.test b/mysql-test/main/named_pipe.test similarity index 100% rename from mysql-test/t/named_pipe.test rename to mysql-test/main/named_pipe.test diff --git a/mysql-test/r/negation_elimination.result b/mysql-test/main/negation_elimination.result similarity index 100% rename from mysql-test/r/negation_elimination.result rename to mysql-test/main/negation_elimination.result diff --git a/mysql-test/t/negation_elimination.test b/mysql-test/main/negation_elimination.test similarity index 100% rename from mysql-test/t/negation_elimination.test rename to mysql-test/main/negation_elimination.test diff --git a/mysql-test/t/no-threads-master.opt b/mysql-test/main/no-threads-master.opt similarity index 100% rename from mysql-test/t/no-threads-master.opt rename to mysql-test/main/no-threads-master.opt diff --git a/mysql-test/r/no-threads.result b/mysql-test/main/no-threads.result similarity index 100% rename from mysql-test/r/no-threads.result rename to mysql-test/main/no-threads.result diff --git a/mysql-test/t/no-threads.test b/mysql-test/main/no-threads.test similarity index 100% rename from mysql-test/t/no-threads.test rename to mysql-test/main/no-threads.test diff --git a/mysql-test/r/no_binlog.result b/mysql-test/main/no_binlog.result similarity index 100% rename from mysql-test/r/no_binlog.result rename to mysql-test/main/no_binlog.result diff --git a/mysql-test/t/no_binlog.test b/mysql-test/main/no_binlog.test similarity index 100% rename from mysql-test/t/no_binlog.test rename to 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 similarity index 100% rename from mysql-test/r/no_password_column-mdev-11170.result rename to 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 similarity index 100% rename from mysql-test/t/no_password_column-mdev-11170.test rename to 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 similarity index 100% rename from mysql-test/r/non_blocking_api.result rename to 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 similarity index 100% rename from mysql-test/t/non_blocking_api.test rename to 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 similarity index 100% rename from mysql-test/r/not_embedded_server.result rename to 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 similarity index 100% rename from mysql-test/t/not_embedded_server.test rename to mysql-test/main/not_embedded_server.test diff --git a/mysql-test/r/not_partition.result b/mysql-test/main/not_partition.result similarity index 100% rename from mysql-test/r/not_partition.result rename to mysql-test/main/not_partition.result diff --git a/mysql-test/t/not_partition.test b/mysql-test/main/not_partition.test similarity index 100% rename from mysql-test/t/not_partition.test rename to mysql-test/main/not_partition.test diff --git a/mysql-test/r/null.result b/mysql-test/main/null.result similarity index 100% rename from mysql-test/r/null.result rename to mysql-test/main/null.result diff --git a/mysql-test/t/null.test b/mysql-test/main/null.test similarity index 100% rename from mysql-test/t/null.test rename to mysql-test/main/null.test diff --git a/mysql-test/r/null_key.result b/mysql-test/main/null_key.result similarity index 100% rename from mysql-test/r/null_key.result rename to mysql-test/main/null_key.result diff --git a/mysql-test/t/null_key.test b/mysql-test/main/null_key.test similarity index 100% rename from mysql-test/t/null_key.test rename to mysql-test/main/null_key.test diff --git a/mysql-test/r/odbc.result b/mysql-test/main/odbc.result similarity index 100% rename from mysql-test/r/odbc.result rename to mysql-test/main/odbc.result diff --git a/mysql-test/t/odbc.test b/mysql-test/main/odbc.test similarity index 100% rename from mysql-test/t/odbc.test rename to mysql-test/main/odbc.test diff --git a/mysql-test/r/olap.result b/mysql-test/main/olap.result similarity index 100% rename from mysql-test/r/olap.result rename to mysql-test/main/olap.result diff --git a/mysql-test/t/olap.test b/mysql-test/main/olap.test similarity index 100% rename from mysql-test/t/olap.test rename to mysql-test/main/olap.test diff --git a/mysql-test/t/old-mode-master.opt b/mysql-test/main/old-mode-master.opt similarity index 100% rename from mysql-test/t/old-mode-master.opt rename to mysql-test/main/old-mode-master.opt diff --git a/mysql-test/r/old-mode.result b/mysql-test/main/old-mode.result similarity index 100% rename from mysql-test/r/old-mode.result rename to mysql-test/main/old-mode.result diff --git a/mysql-test/t/old-mode.test b/mysql-test/main/old-mode.test similarity index 100% rename from mysql-test/t/old-mode.test rename to mysql-test/main/old-mode.test diff --git a/mysql-test/r/openssl_1.result b/mysql-test/main/openssl_1.result similarity index 100% rename from mysql-test/r/openssl_1.result rename to mysql-test/main/openssl_1.result diff --git a/mysql-test/t/openssl_1.test b/mysql-test/main/openssl_1.test similarity index 100% rename from mysql-test/t/openssl_1.test rename to mysql-test/main/openssl_1.test diff --git a/mysql-test/r/openssl_6975,tlsv10.result b/mysql-test/main/openssl_6975,tlsv10.result similarity index 100% rename from mysql-test/r/openssl_6975,tlsv10.result rename to 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 similarity index 100% rename from mysql-test/r/openssl_6975,tlsv12.result rename to mysql-test/main/openssl_6975,tlsv12.result diff --git a/mysql-test/t/openssl_6975.combinations b/mysql-test/main/openssl_6975.combinations similarity index 100% rename from mysql-test/t/openssl_6975.combinations rename to mysql-test/main/openssl_6975.combinations diff --git a/mysql-test/t/openssl_6975.test b/mysql-test/main/openssl_6975.test similarity index 100% rename from mysql-test/t/openssl_6975.test rename to mysql-test/main/openssl_6975.test diff --git a/mysql-test/r/opt_tvc.result b/mysql-test/main/opt_tvc.result similarity index 100% rename from mysql-test/r/opt_tvc.result rename to mysql-test/main/opt_tvc.result diff --git a/mysql-test/t/opt_tvc.test b/mysql-test/main/opt_tvc.test similarity index 100% rename from mysql-test/t/opt_tvc.test rename to 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 similarity index 100% rename from mysql-test/r/order_by-mdev-10122.result rename to 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 similarity index 100% rename from mysql-test/t/order_by-mdev-10122.test rename to mysql-test/main/order_by-mdev-10122.test diff --git a/mysql-test/r/order_by.result b/mysql-test/main/order_by.result similarity index 100% rename from mysql-test/r/order_by.result rename to mysql-test/main/order_by.result diff --git a/mysql-test/t/order_by.test b/mysql-test/main/order_by.test similarity index 100% rename from mysql-test/t/order_by.test rename to mysql-test/main/order_by.test diff --git a/mysql-test/r/order_by_innodb.result b/mysql-test/main/order_by_innodb.result similarity index 100% rename from mysql-test/r/order_by_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/order_by_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/order_by_optimizer.result rename to 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 similarity index 100% rename from mysql-test/t/order_by_optimizer.test rename to 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 similarity index 100% rename from mysql-test/r/order_by_optimizer_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/order_by_optimizer_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/order_by_sortkey.result rename to 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 similarity index 100% rename from mysql-test/t/order_by_sortkey.test rename to 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 similarity index 100% rename from mysql-test/r/order_by_zerolength-4285.result rename to 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 similarity index 100% rename from mysql-test/t/order_by_zerolength-4285.test rename to 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 similarity index 100% rename from mysql-test/r/order_fill_sortbuf.result rename to 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 similarity index 100% rename from mysql-test/t/order_fill_sortbuf.test rename to mysql-test/main/order_fill_sortbuf.test diff --git a/mysql-test/r/outfile.result b/mysql-test/main/outfile.result similarity index 100% rename from mysql-test/r/outfile.result rename to mysql-test/main/outfile.result diff --git a/mysql-test/t/outfile.test b/mysql-test/main/outfile.test similarity index 100% rename from mysql-test/t/outfile.test rename to mysql-test/main/outfile.test diff --git a/mysql-test/r/outfile_loaddata.result b/mysql-test/main/outfile_loaddata.result similarity index 100% rename from mysql-test/r/outfile_loaddata.result rename to mysql-test/main/outfile_loaddata.result diff --git a/mysql-test/t/outfile_loaddata.test b/mysql-test/main/outfile_loaddata.test similarity index 100% rename from mysql-test/t/outfile_loaddata.test rename to mysql-test/main/outfile_loaddata.test diff --git a/mysql-test/r/overflow.result b/mysql-test/main/overflow.result similarity index 100% rename from mysql-test/r/overflow.result rename to mysql-test/main/overflow.result diff --git a/mysql-test/t/overflow.test b/mysql-test/main/overflow.test similarity index 100% rename from mysql-test/t/overflow.test rename to mysql-test/main/overflow.test diff --git a/mysql-test/r/packet.result b/mysql-test/main/packet.result similarity index 100% rename from mysql-test/r/packet.result rename to mysql-test/main/packet.result diff --git a/mysql-test/t/packet.test b/mysql-test/main/packet.test similarity index 100% rename from mysql-test/t/packet.test rename to mysql-test/main/packet.test diff --git a/mysql-test/r/parser.result b/mysql-test/main/parser.result similarity index 100% rename from mysql-test/r/parser.result rename to mysql-test/main/parser.result diff --git a/mysql-test/t/parser.test b/mysql-test/main/parser.test similarity index 100% rename from mysql-test/t/parser.test rename to mysql-test/main/parser.test diff --git a/mysql-test/r/parser_bug21114_innodb.result b/mysql-test/main/parser_bug21114_innodb.result similarity index 100% rename from mysql-test/r/parser_bug21114_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/parser_bug21114_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/parser_not_embedded.result rename to 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 similarity index 100% rename from mysql-test/t/parser_not_embedded.test rename to mysql-test/main/parser_not_embedded.test diff --git a/mysql-test/r/parser_precedence.result b/mysql-test/main/parser_precedence.result similarity index 100% rename from mysql-test/r/parser_precedence.result rename to mysql-test/main/parser_precedence.result diff --git a/mysql-test/t/parser_precedence.test b/mysql-test/main/parser_precedence.test similarity index 100% rename from mysql-test/t/parser_precedence.test rename to mysql-test/main/parser_precedence.test diff --git a/mysql-test/r/parser_stack.result b/mysql-test/main/parser_stack.result similarity index 100% rename from mysql-test/r/parser_stack.result rename to mysql-test/main/parser_stack.result diff --git a/mysql-test/t/parser_stack.test b/mysql-test/main/parser_stack.test similarity index 100% rename from mysql-test/t/parser_stack.test rename to mysql-test/main/parser_stack.test diff --git a/mysql-test/t/partition-master.opt b/mysql-test/main/partition-master.opt similarity index 100% rename from mysql-test/t/partition-master.opt rename to mysql-test/main/partition-master.opt diff --git a/mysql-test/r/partition.result b/mysql-test/main/partition.result similarity index 100% rename from mysql-test/r/partition.result rename to mysql-test/main/partition.result diff --git a/mysql-test/t/partition.test b/mysql-test/main/partition.test similarity index 100% rename from mysql-test/t/partition.test rename to mysql-test/main/partition.test diff --git a/mysql-test/r/partition_alter.result b/mysql-test/main/partition_alter.result similarity index 100% rename from mysql-test/r/partition_alter.result rename to mysql-test/main/partition_alter.result diff --git a/mysql-test/t/partition_alter.test b/mysql-test/main/partition_alter.test similarity index 100% rename from mysql-test/t/partition_alter.test rename to mysql-test/main/partition_alter.test diff --git a/mysql-test/r/partition_binlog.result b/mysql-test/main/partition_binlog.result similarity index 100% rename from mysql-test/r/partition_binlog.result rename to mysql-test/main/partition_binlog.result diff --git a/mysql-test/t/partition_binlog.test b/mysql-test/main/partition_binlog.test similarity index 100% rename from mysql-test/t/partition_binlog.test rename to mysql-test/main/partition_binlog.test diff --git a/mysql-test/r/partition_binlog_stmt.result b/mysql-test/main/partition_binlog_stmt.result similarity index 100% rename from mysql-test/r/partition_binlog_stmt.result rename to 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 similarity index 100% rename from mysql-test/t/partition_binlog_stmt.test rename to mysql-test/main/partition_binlog_stmt.test diff --git a/mysql-test/r/partition_blackhole.result b/mysql-test/main/partition_blackhole.result similarity index 100% rename from mysql-test/r/partition_blackhole.result rename to mysql-test/main/partition_blackhole.result diff --git a/mysql-test/t/partition_blackhole.test b/mysql-test/main/partition_blackhole.test similarity index 100% rename from mysql-test/t/partition_blackhole.test rename to mysql-test/main/partition_blackhole.test diff --git a/mysql-test/r/partition_bug18198.result b/mysql-test/main/partition_bug18198.result similarity index 100% rename from mysql-test/r/partition_bug18198.result rename to mysql-test/main/partition_bug18198.result diff --git a/mysql-test/t/partition_bug18198.test b/mysql-test/main/partition_bug18198.test similarity index 100% rename from mysql-test/t/partition_bug18198.test rename to mysql-test/main/partition_bug18198.test diff --git a/mysql-test/r/partition_cache.result b/mysql-test/main/partition_cache.result similarity index 100% rename from mysql-test/r/partition_cache.result rename to mysql-test/main/partition_cache.result diff --git a/mysql-test/t/partition_cache.test b/mysql-test/main/partition_cache.test similarity index 100% rename from mysql-test/t/partition_cache.test rename to mysql-test/main/partition_cache.test diff --git a/mysql-test/r/partition_cache_innodb.result b/mysql-test/main/partition_cache_innodb.result similarity index 100% rename from mysql-test/r/partition_cache_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/partition_cache_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/partition_cache_myisam.result rename to 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 similarity index 100% rename from mysql-test/t/partition_cache_myisam.test rename to mysql-test/main/partition_cache_myisam.test diff --git a/mysql-test/r/partition_charset.result b/mysql-test/main/partition_charset.result similarity index 100% rename from mysql-test/r/partition_charset.result rename to mysql-test/main/partition_charset.result diff --git a/mysql-test/t/partition_charset.test b/mysql-test/main/partition_charset.test similarity index 100% rename from mysql-test/t/partition_charset.test rename to mysql-test/main/partition_charset.test diff --git a/mysql-test/r/partition_column.result b/mysql-test/main/partition_column.result similarity index 100% rename from mysql-test/r/partition_column.result rename to mysql-test/main/partition_column.result diff --git a/mysql-test/t/partition_column.test b/mysql-test/main/partition_column.test similarity index 100% rename from mysql-test/t/partition_column.test rename to mysql-test/main/partition_column.test diff --git a/mysql-test/r/partition_column_prune.result b/mysql-test/main/partition_column_prune.result similarity index 100% rename from mysql-test/r/partition_column_prune.result rename to 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 similarity index 100% rename from mysql-test/t/partition_column_prune.test rename to mysql-test/main/partition_column_prune.test diff --git a/mysql-test/r/partition_csv.result b/mysql-test/main/partition_csv.result similarity index 100% rename from mysql-test/r/partition_csv.result rename to mysql-test/main/partition_csv.result diff --git a/mysql-test/t/partition_csv.test b/mysql-test/main/partition_csv.test similarity index 100% rename from mysql-test/t/partition_csv.test rename to mysql-test/main/partition_csv.test diff --git a/mysql-test/r/partition_datatype.result b/mysql-test/main/partition_datatype.result similarity index 100% rename from mysql-test/r/partition_datatype.result rename to mysql-test/main/partition_datatype.result diff --git a/mysql-test/t/partition_datatype.test b/mysql-test/main/partition_datatype.test similarity index 100% rename from mysql-test/t/partition_datatype.test rename to mysql-test/main/partition_datatype.test diff --git a/mysql-test/r/partition_debug_sync.result b/mysql-test/main/partition_debug_sync.result similarity index 100% rename from mysql-test/r/partition_debug_sync.result rename to 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 similarity index 100% rename from mysql-test/t/partition_debug_sync.test rename to mysql-test/main/partition_debug_sync.test diff --git a/mysql-test/r/partition_default.result b/mysql-test/main/partition_default.result similarity index 100% rename from mysql-test/r/partition_default.result rename to mysql-test/main/partition_default.result diff --git a/mysql-test/t/partition_default.test b/mysql-test/main/partition_default.test similarity index 100% rename from mysql-test/t/partition_default.test rename to mysql-test/main/partition_default.test diff --git a/mysql-test/t/partition_disabled-master.opt b/mysql-test/main/partition_disabled-master.opt similarity index 100% rename from mysql-test/t/partition_disabled-master.opt rename to mysql-test/main/partition_disabled-master.opt diff --git a/mysql-test/r/partition_disabled.result b/mysql-test/main/partition_disabled.result similarity index 100% rename from mysql-test/r/partition_disabled.result rename to mysql-test/main/partition_disabled.result diff --git a/mysql-test/t/partition_disabled.test b/mysql-test/main/partition_disabled.test similarity index 100% rename from mysql-test/t/partition_disabled.test rename to mysql-test/main/partition_disabled.test diff --git a/mysql-test/r/partition_error.result b/mysql-test/main/partition_error.result similarity index 100% rename from mysql-test/r/partition_error.result rename to mysql-test/main/partition_error.result diff --git a/mysql-test/t/partition_error.test b/mysql-test/main/partition_error.test similarity index 100% rename from mysql-test/t/partition_error.test rename to mysql-test/main/partition_error.test diff --git a/mysql-test/r/partition_example.result b/mysql-test/main/partition_example.result similarity index 100% rename from mysql-test/r/partition_example.result rename to mysql-test/main/partition_example.result diff --git a/mysql-test/t/partition_example.test b/mysql-test/main/partition_example.test similarity index 100% rename from mysql-test/t/partition_example.test rename to mysql-test/main/partition_example.test diff --git a/mysql-test/t/partition_exchange-master.opt b/mysql-test/main/partition_exchange-master.opt similarity index 100% rename from mysql-test/t/partition_exchange-master.opt rename to mysql-test/main/partition_exchange-master.opt diff --git a/mysql-test/r/partition_exchange.result b/mysql-test/main/partition_exchange.result similarity index 100% rename from mysql-test/r/partition_exchange.result rename to mysql-test/main/partition_exchange.result diff --git a/mysql-test/t/partition_exchange.test b/mysql-test/main/partition_exchange.test similarity index 100% rename from mysql-test/t/partition_exchange.test rename to mysql-test/main/partition_exchange.test diff --git a/mysql-test/r/partition_explicit_prune.result b/mysql-test/main/partition_explicit_prune.result similarity index 100% rename from mysql-test/r/partition_explicit_prune.result rename to 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 similarity index 100% rename from mysql-test/t/partition_explicit_prune.test rename to mysql-test/main/partition_explicit_prune.test diff --git a/mysql-test/r/partition_grant.result b/mysql-test/main/partition_grant.result similarity index 100% rename from mysql-test/r/partition_grant.result rename to mysql-test/main/partition_grant.result diff --git a/mysql-test/t/partition_grant.test b/mysql-test/main/partition_grant.test similarity index 100% rename from mysql-test/t/partition_grant.test rename to mysql-test/main/partition_grant.test diff --git a/mysql-test/r/partition_hash.result b/mysql-test/main/partition_hash.result similarity index 100% rename from mysql-test/r/partition_hash.result rename to mysql-test/main/partition_hash.result diff --git a/mysql-test/t/partition_hash.test b/mysql-test/main/partition_hash.test similarity index 100% rename from mysql-test/t/partition_hash.test rename to mysql-test/main/partition_hash.test diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/main/partition_innodb.result similarity index 100% rename from mysql-test/r/partition_innodb.result rename to mysql-test/main/partition_innodb.result diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/main/partition_innodb.test similarity index 100% rename from mysql-test/t/partition_innodb.test rename to mysql-test/main/partition_innodb.test diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/main/partition_innodb_plugin.result similarity index 100% rename from mysql-test/r/partition_innodb_plugin.result rename to 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 similarity index 100% rename from mysql-test/t/partition_innodb_plugin.test rename to 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 similarity index 100% rename from mysql-test/t/partition_innodb_semi_consistent-master.opt rename to 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 similarity index 100% rename from mysql-test/r/partition_innodb_semi_consistent.result rename to 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 similarity index 100% rename from mysql-test/t/partition_innodb_semi_consistent.test rename to 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 similarity index 100% rename from mysql-test/r/partition_innodb_stmt.result rename to 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 similarity index 100% rename from mysql-test/t/partition_innodb_stmt.test rename to 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 similarity index 100% rename from mysql-test/r/partition_key_cache.result rename to 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 similarity index 100% rename from mysql-test/t/partition_key_cache.test rename to mysql-test/main/partition_key_cache.test diff --git a/mysql-test/r/partition_list.result b/mysql-test/main/partition_list.result similarity index 100% rename from mysql-test/r/partition_list.result rename to mysql-test/main/partition_list.result diff --git a/mysql-test/t/partition_list.test b/mysql-test/main/partition_list.test similarity index 100% rename from mysql-test/t/partition_list.test rename to mysql-test/main/partition_list.test diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/main/partition_mgm.result similarity index 100% rename from mysql-test/r/partition_mgm.result rename to mysql-test/main/partition_mgm.result diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/main/partition_mgm.test similarity index 100% rename from mysql-test/t/partition_mgm.test rename to mysql-test/main/partition_mgm.test diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/main/partition_mgm_err.result similarity index 100% rename from mysql-test/r/partition_mgm_err.result rename to 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 similarity index 100% rename from mysql-test/t/partition_mgm_err.test rename to 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 similarity index 100% rename from mysql-test/r/partition_mgm_err2.result rename to 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 similarity index 100% rename from mysql-test/t/partition_mgm_err2.test rename to mysql-test/main/partition_mgm_err2.test diff --git a/mysql-test/r/partition_myisam.result b/mysql-test/main/partition_myisam.result similarity index 100% rename from mysql-test/r/partition_myisam.result rename to mysql-test/main/partition_myisam.result diff --git a/mysql-test/t/partition_myisam.test b/mysql-test/main/partition_myisam.test similarity index 100% rename from mysql-test/t/partition_myisam.test rename to 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 similarity index 100% rename from mysql-test/t/partition_not_blackhole-master.opt rename to 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 similarity index 100% rename from mysql-test/r/partition_not_blackhole.result rename to 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 similarity index 100% rename from mysql-test/t/partition_not_blackhole.test rename to 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 similarity index 100% rename from mysql-test/t/partition_not_windows-master.opt rename to 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 similarity index 100% rename from mysql-test/r/partition_not_windows.result rename to 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 similarity index 100% rename from mysql-test/t/partition_not_windows.test rename to 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 similarity index 100% rename from mysql-test/t/partition_open_files_limit-master.opt rename to 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 similarity index 100% rename from mysql-test/r/partition_open_files_limit.result rename to 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 similarity index 100% rename from mysql-test/t/partition_open_files_limit.test rename to mysql-test/main/partition_open_files_limit.test diff --git a/mysql-test/r/partition_order.result b/mysql-test/main/partition_order.result similarity index 100% rename from mysql-test/r/partition_order.result rename to mysql-test/main/partition_order.result diff --git a/mysql-test/t/partition_order.test b/mysql-test/main/partition_order.test similarity index 100% rename from mysql-test/t/partition_order.test rename to mysql-test/main/partition_order.test diff --git a/mysql-test/r/partition_pruning.result b/mysql-test/main/partition_pruning.result similarity index 100% rename from mysql-test/r/partition_pruning.result rename to mysql-test/main/partition_pruning.result diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/main/partition_pruning.test similarity index 100% rename from mysql-test/t/partition_pruning.test rename to mysql-test/main/partition_pruning.test diff --git a/mysql-test/r/partition_range.result b/mysql-test/main/partition_range.result similarity index 100% rename from mysql-test/r/partition_range.result rename to mysql-test/main/partition_range.result diff --git a/mysql-test/t/partition_range.test b/mysql-test/main/partition_range.test similarity index 100% rename from mysql-test/t/partition_range.test rename to mysql-test/main/partition_range.test diff --git a/mysql-test/r/partition_rename_longfilename.result b/mysql-test/main/partition_rename_longfilename.result similarity index 100% rename from mysql-test/r/partition_rename_longfilename.result rename to 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 similarity index 100% rename from mysql-test/t/partition_rename_longfilename.test rename to mysql-test/main/partition_rename_longfilename.test diff --git a/mysql-test/r/partition_symlink.result b/mysql-test/main/partition_symlink.result similarity index 100% rename from mysql-test/r/partition_symlink.result rename to mysql-test/main/partition_symlink.result diff --git a/mysql-test/t/partition_symlink.test b/mysql-test/main/partition_symlink.test similarity index 100% rename from mysql-test/t/partition_symlink.test rename to mysql-test/main/partition_symlink.test diff --git a/mysql-test/r/partition_sync.result b/mysql-test/main/partition_sync.result similarity index 100% rename from mysql-test/r/partition_sync.result rename to mysql-test/main/partition_sync.result diff --git a/mysql-test/t/partition_sync.test b/mysql-test/main/partition_sync.test similarity index 100% rename from mysql-test/t/partition_sync.test rename to mysql-test/main/partition_sync.test diff --git a/mysql-test/r/partition_truncate.result b/mysql-test/main/partition_truncate.result similarity index 100% rename from mysql-test/r/partition_truncate.result rename to mysql-test/main/partition_truncate.result diff --git a/mysql-test/t/partition_truncate.test b/mysql-test/main/partition_truncate.test similarity index 100% rename from mysql-test/t/partition_truncate.test rename to mysql-test/main/partition_truncate.test diff --git a/mysql-test/r/partition_utf8.result b/mysql-test/main/partition_utf8.result similarity index 100% rename from mysql-test/r/partition_utf8.result rename to mysql-test/main/partition_utf8.result diff --git a/mysql-test/t/partition_utf8.test b/mysql-test/main/partition_utf8.test similarity index 100% rename from mysql-test/t/partition_utf8.test rename to mysql-test/main/partition_utf8.test diff --git a/mysql-test/r/partition_windows.result b/mysql-test/main/partition_windows.result similarity index 100% rename from mysql-test/r/partition_windows.result rename to mysql-test/main/partition_windows.result diff --git a/mysql-test/t/partition_windows.test b/mysql-test/main/partition_windows.test similarity index 100% rename from mysql-test/t/partition_windows.test rename to mysql-test/main/partition_windows.test diff --git a/mysql-test/r/perror-win.result b/mysql-test/main/perror-win.result similarity index 100% rename from mysql-test/r/perror-win.result rename to mysql-test/main/perror-win.result diff --git a/mysql-test/t/perror-win.test b/mysql-test/main/perror-win.test similarity index 87% rename from mysql-test/t/perror-win.test rename to 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 similarity index 100% rename from mysql-test/r/perror.result rename to mysql-test/main/perror.result diff --git a/mysql-test/t/perror.test b/mysql-test/main/perror.test similarity index 95% rename from mysql-test/t/perror.test rename to 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 similarity index 100% rename from mysql-test/r/plugin.result rename to mysql-test/main/plugin.result diff --git a/mysql-test/t/plugin.test b/mysql-test/main/plugin.test similarity index 100% rename from mysql-test/t/plugin.test rename to mysql-test/main/plugin.test diff --git a/mysql-test/r/plugin_auth.result b/mysql-test/main/plugin_auth.result similarity index 100% rename from mysql-test/r/plugin_auth.result rename to mysql-test/main/plugin_auth.result diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/main/plugin_auth.test similarity index 100% rename from mysql-test/t/plugin_auth.test rename to mysql-test/main/plugin_auth.test diff --git a/mysql-test/r/plugin_auth_qa.result b/mysql-test/main/plugin_auth_qa.result similarity index 100% rename from mysql-test/r/plugin_auth_qa.result rename to 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 similarity index 100% rename from mysql-test/t/plugin_auth_qa.test rename to 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 similarity index 100% rename from mysql-test/r/plugin_auth_qa_1.result rename to 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 similarity index 100% rename from mysql-test/t/plugin_auth_qa_1.test rename to 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 similarity index 100% rename from mysql-test/t/plugin_auth_qa_2-master.opt rename to 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 similarity index 100% rename from mysql-test/r/plugin_auth_qa_2.result rename to 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 similarity index 100% rename from mysql-test/t/plugin_auth_qa_2.test rename to 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 similarity index 100% rename from mysql-test/t/plugin_auth_qa_3-master.opt rename to 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 similarity index 100% rename from mysql-test/r/plugin_auth_qa_3.result rename to 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 similarity index 100% rename from mysql-test/t/plugin_auth_qa_3.test rename to mysql-test/main/plugin_auth_qa_3.test diff --git a/mysql-test/r/plugin_innodb.result b/mysql-test/main/plugin_innodb.result similarity index 100% rename from mysql-test/r/plugin_innodb.result rename to mysql-test/main/plugin_innodb.result diff --git a/mysql-test/t/plugin_innodb.test b/mysql-test/main/plugin_innodb.test similarity index 100% rename from mysql-test/t/plugin_innodb.test rename to mysql-test/main/plugin_innodb.test diff --git a/mysql-test/t/plugin_load.opt b/mysql-test/main/plugin_load.opt similarity index 100% rename from mysql-test/t/plugin_load.opt rename to mysql-test/main/plugin_load.opt diff --git a/mysql-test/r/plugin_load.result b/mysql-test/main/plugin_load.result similarity index 100% rename from mysql-test/r/plugin_load.result rename to mysql-test/main/plugin_load.result diff --git a/mysql-test/t/plugin_load.test b/mysql-test/main/plugin_load.test similarity index 100% rename from mysql-test/t/plugin_load.test rename to mysql-test/main/plugin_load.test diff --git a/mysql-test/t/plugin_load_option.opt b/mysql-test/main/plugin_load_option.opt similarity index 100% rename from mysql-test/t/plugin_load_option.opt rename to 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 similarity index 100% rename from mysql-test/r/plugin_load_option.result rename to 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 similarity index 100% rename from mysql-test/t/plugin_load_option.test rename to mysql-test/main/plugin_load_option.test diff --git a/mysql-test/t/plugin_loaderr.opt b/mysql-test/main/plugin_loaderr.opt similarity index 100% rename from mysql-test/t/plugin_loaderr.opt rename to mysql-test/main/plugin_loaderr.opt diff --git a/mysql-test/r/plugin_loaderr.result b/mysql-test/main/plugin_loaderr.result similarity index 100% rename from mysql-test/r/plugin_loaderr.result rename to mysql-test/main/plugin_loaderr.result diff --git a/mysql-test/t/plugin_loaderr.test b/mysql-test/main/plugin_loaderr.test similarity index 100% rename from mysql-test/t/plugin_loaderr.test rename to mysql-test/main/plugin_loaderr.test diff --git a/mysql-test/t/plugin_maturity-master.opt b/mysql-test/main/plugin_maturity-master.opt similarity index 100% rename from mysql-test/t/plugin_maturity-master.opt rename to mysql-test/main/plugin_maturity-master.opt diff --git a/mysql-test/r/plugin_maturity.result b/mysql-test/main/plugin_maturity.result similarity index 100% rename from mysql-test/r/plugin_maturity.result rename to mysql-test/main/plugin_maturity.result diff --git a/mysql-test/t/plugin_maturity.test b/mysql-test/main/plugin_maturity.test similarity index 100% rename from mysql-test/t/plugin_maturity.test rename to mysql-test/main/plugin_maturity.test diff --git a/mysql-test/r/plugin_not_embedded.result b/mysql-test/main/plugin_not_embedded.result similarity index 100% rename from mysql-test/r/plugin_not_embedded.result rename to 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 similarity index 100% rename from mysql-test/t/plugin_not_embedded.test rename to mysql-test/main/plugin_not_embedded.test diff --git a/mysql-test/r/plugin_vars.result b/mysql-test/main/plugin_vars.result similarity index 100% rename from mysql-test/r/plugin_vars.result rename to mysql-test/main/plugin_vars.result diff --git a/mysql-test/t/plugin_vars.test b/mysql-test/main/plugin_vars.test similarity index 100% rename from mysql-test/t/plugin_vars.test rename to mysql-test/main/plugin_vars.test diff --git a/mysql-test/t/pool_of_threads.cnf b/mysql-test/main/pool_of_threads.cnf similarity index 100% rename from mysql-test/t/pool_of_threads.cnf rename to 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 similarity index 100% rename from mysql-test/r/pool_of_threads.result rename to 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 similarity index 100% rename from mysql-test/t/pool_of_threads.test rename to mysql-test/main/pool_of_threads.test diff --git a/mysql-test/r/preload.result b/mysql-test/main/preload.result similarity index 100% rename from mysql-test/r/preload.result rename to mysql-test/main/preload.result diff --git a/mysql-test/t/preload.test b/mysql-test/main/preload.test similarity index 100% rename from mysql-test/t/preload.test rename to mysql-test/main/preload.test diff --git a/mysql-test/r/processlist.result b/mysql-test/main/processlist.result similarity index 100% rename from mysql-test/r/processlist.result rename to mysql-test/main/processlist.result diff --git a/mysql-test/t/processlist.test b/mysql-test/main/processlist.test similarity index 100% rename from mysql-test/t/processlist.test rename to mysql-test/main/processlist.test diff --git a/mysql-test/r/profiling.result b/mysql-test/main/profiling.result similarity index 100% rename from mysql-test/r/profiling.result rename to mysql-test/main/profiling.result diff --git a/mysql-test/t/profiling.test b/mysql-test/main/profiling.test similarity index 100% rename from mysql-test/t/profiling.test rename to mysql-test/main/profiling.test diff --git a/mysql-test/r/progress_976225.result b/mysql-test/main/progress_976225.result similarity index 100% rename from mysql-test/r/progress_976225.result rename to mysql-test/main/progress_976225.result diff --git a/mysql-test/t/progress_976225.test b/mysql-test/main/progress_976225.test similarity index 100% rename from mysql-test/t/progress_976225.test rename to mysql-test/main/progress_976225.test diff --git a/mysql-test/t/ps-master.opt b/mysql-test/main/ps-master.opt similarity index 100% rename from mysql-test/t/ps-master.opt rename to mysql-test/main/ps-master.opt diff --git a/mysql-test/r/ps.result b/mysql-test/main/ps.result similarity index 100% rename from mysql-test/r/ps.result rename to mysql-test/main/ps.result diff --git a/mysql-test/t/ps.test b/mysql-test/main/ps.test similarity index 99% rename from mysql-test/t/ps.test rename to 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 similarity index 100% rename from mysql-test/r/ps_10nestset.result rename to mysql-test/main/ps_10nestset.result diff --git a/mysql-test/t/ps_10nestset.test b/mysql-test/main/ps_10nestset.test similarity index 100% rename from mysql-test/t/ps_10nestset.test rename to mysql-test/main/ps_10nestset.test diff --git a/mysql-test/r/ps_11bugs.result b/mysql-test/main/ps_11bugs.result similarity index 100% rename from mysql-test/r/ps_11bugs.result rename to mysql-test/main/ps_11bugs.result diff --git a/mysql-test/t/ps_11bugs.test b/mysql-test/main/ps_11bugs.test similarity index 100% rename from mysql-test/t/ps_11bugs.test rename to mysql-test/main/ps_11bugs.test diff --git a/mysql-test/r/ps_1general.result b/mysql-test/main/ps_1general.result similarity index 100% rename from mysql-test/r/ps_1general.result rename to mysql-test/main/ps_1general.result diff --git a/mysql-test/t/ps_1general.test b/mysql-test/main/ps_1general.test similarity index 100% rename from mysql-test/t/ps_1general.test rename to mysql-test/main/ps_1general.test diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/main/ps_2myisam.result similarity index 100% rename from mysql-test/r/ps_2myisam.result rename to mysql-test/main/ps_2myisam.result diff --git a/mysql-test/t/ps_2myisam.test b/mysql-test/main/ps_2myisam.test similarity index 100% rename from mysql-test/t/ps_2myisam.test rename to mysql-test/main/ps_2myisam.test diff --git a/mysql-test/t/ps_3innodb-master.opt b/mysql-test/main/ps_3innodb-master.opt similarity index 100% rename from mysql-test/t/ps_3innodb-master.opt rename to mysql-test/main/ps_3innodb-master.opt diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/main/ps_3innodb.result similarity index 100% rename from mysql-test/r/ps_3innodb.result rename to mysql-test/main/ps_3innodb.result diff --git a/mysql-test/t/ps_3innodb.test b/mysql-test/main/ps_3innodb.test similarity index 100% rename from mysql-test/t/ps_3innodb.test rename to mysql-test/main/ps_3innodb.test diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/main/ps_4heap.result similarity index 100% rename from mysql-test/r/ps_4heap.result rename to mysql-test/main/ps_4heap.result diff --git a/mysql-test/t/ps_4heap.test b/mysql-test/main/ps_4heap.test similarity index 100% rename from mysql-test/t/ps_4heap.test rename to mysql-test/main/ps_4heap.test diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/main/ps_5merge.result similarity index 100% rename from mysql-test/r/ps_5merge.result rename to mysql-test/main/ps_5merge.result diff --git a/mysql-test/t/ps_5merge.test b/mysql-test/main/ps_5merge.test similarity index 100% rename from mysql-test/t/ps_5merge.test rename to mysql-test/main/ps_5merge.test diff --git a/mysql-test/r/ps_change_master.result b/mysql-test/main/ps_change_master.result similarity index 100% rename from mysql-test/r/ps_change_master.result rename to 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 similarity index 100% rename from mysql-test/t/ps_change_master.test rename to mysql-test/main/ps_change_master.test diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/main/ps_ddl.result similarity index 100% rename from mysql-test/r/ps_ddl.result rename to mysql-test/main/ps_ddl.result diff --git a/mysql-test/t/ps_ddl.test b/mysql-test/main/ps_ddl.test similarity index 100% rename from mysql-test/t/ps_ddl.test rename to mysql-test/main/ps_ddl.test diff --git a/mysql-test/r/ps_ddl1.result b/mysql-test/main/ps_ddl1.result similarity index 100% rename from mysql-test/r/ps_ddl1.result rename to mysql-test/main/ps_ddl1.result diff --git a/mysql-test/t/ps_ddl1.test b/mysql-test/main/ps_ddl1.test similarity index 100% rename from mysql-test/t/ps_ddl1.test rename to mysql-test/main/ps_ddl1.test diff --git a/mysql-test/r/ps_grant.result b/mysql-test/main/ps_grant.result similarity index 100% rename from mysql-test/r/ps_grant.result rename to mysql-test/main/ps_grant.result diff --git a/mysql-test/t/ps_grant.test b/mysql-test/main/ps_grant.test similarity index 100% rename from mysql-test/t/ps_grant.test rename to 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 similarity index 100% rename from mysql-test/r/ps_max_subselect-5113.result rename to 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 similarity index 100% rename from mysql-test/t/ps_max_subselect-5113.test rename to 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 similarity index 100% rename from mysql-test/r/ps_not_windows.result rename to 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 similarity index 100% rename from mysql-test/t/ps_not_windows.test rename to mysql-test/main/ps_not_windows.test diff --git a/mysql-test/r/query_cache.result b/mysql-test/main/query_cache.result similarity index 100% rename from mysql-test/r/query_cache.result rename to mysql-test/main/query_cache.result diff --git a/mysql-test/t/query_cache.test b/mysql-test/main/query_cache.test similarity index 100% rename from mysql-test/t/query_cache.test rename to mysql-test/main/query_cache.test diff --git a/mysql-test/r/query_cache_28249.result b/mysql-test/main/query_cache_28249.result similarity index 100% rename from mysql-test/r/query_cache_28249.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_28249.test rename to 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 similarity index 100% rename from mysql-test/r/query_cache_debug.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_debug.test rename to 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 similarity index 100% rename from mysql-test/r/query_cache_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/query_cache_merge.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_merge.test rename to 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 similarity index 100% rename from mysql-test/t/query_cache_notembedded-master.opt rename to 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 similarity index 100% rename from mysql-test/r/query_cache_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_notembedded.test rename to 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 similarity index 100% rename from mysql-test/r/query_cache_ps_no_prot.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_ps_no_prot.test rename to 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 similarity index 100% rename from mysql-test/r/query_cache_ps_ps_prot.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_ps_ps_prot.test rename to 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 similarity index 100% rename from mysql-test/r/query_cache_with_views.result rename to 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 similarity index 100% rename from mysql-test/t/query_cache_with_views.test rename to 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 similarity index 100% rename from mysql-test/r/quick_select_4161.result rename to 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 similarity index 100% rename from mysql-test/t/quick_select_4161.test rename to mysql-test/main/quick_select_4161.test diff --git a/mysql-test/r/range.result b/mysql-test/main/range.result similarity index 100% rename from mysql-test/r/range.result rename to mysql-test/main/range.result diff --git a/mysql-test/t/range.test b/mysql-test/main/range.test similarity index 100% rename from mysql-test/t/range.test rename to mysql-test/main/range.test diff --git a/mysql-test/r/range_innodb.result b/mysql-test/main/range_innodb.result similarity index 100% rename from mysql-test/r/range_innodb.result rename to mysql-test/main/range_innodb.result diff --git a/mysql-test/t/range_innodb.test b/mysql-test/main/range_innodb.test similarity index 100% rename from mysql-test/t/range_innodb.test rename to mysql-test/main/range_innodb.test diff --git a/mysql-test/r/range_interrupted-13751.result b/mysql-test/main/range_interrupted-13751.result similarity index 100% rename from mysql-test/r/range_interrupted-13751.result rename to 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 similarity index 100% rename from mysql-test/t/range_interrupted-13751.test rename to 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 similarity index 100% rename from mysql-test/r/range_mrr_icp.result rename to 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 similarity index 88% rename from mysql-test/t/range_mrr_icp.test rename to 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 similarity index 100% rename from mysql-test/r/range_vs_index_merge.result rename to 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 similarity index 100% rename from mysql-test/t/range_vs_index_merge.test rename to 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 similarity index 100% rename from mysql-test/r/range_vs_index_merge_innodb.result rename to 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 similarity index 74% rename from mysql-test/t/range_vs_index_merge_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/read_many_rows_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/read_many_rows_innodb.test rename to mysql-test/main/read_many_rows_innodb.test diff --git a/mysql-test/r/read_only.result b/mysql-test/main/read_only.result similarity index 100% rename from mysql-test/r/read_only.result rename to mysql-test/main/read_only.result diff --git a/mysql-test/t/read_only.test b/mysql-test/main/read_only.test similarity index 100% rename from mysql-test/t/read_only.test rename to mysql-test/main/read_only.test diff --git a/mysql-test/r/read_only_innodb.result b/mysql-test/main/read_only_innodb.result similarity index 100% rename from mysql-test/r/read_only_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/read_only_innodb.test rename to mysql-test/main/read_only_innodb.test diff --git a/mysql-test/r/rename.result b/mysql-test/main/rename.result similarity index 100% rename from mysql-test/r/rename.result rename to mysql-test/main/rename.result diff --git a/mysql-test/t/rename.test b/mysql-test/main/rename.test similarity index 100% rename from mysql-test/t/rename.test rename to mysql-test/main/rename.test diff --git a/mysql-test/r/renamedb.result b/mysql-test/main/renamedb.result similarity index 100% rename from mysql-test/r/renamedb.result rename to mysql-test/main/renamedb.result diff --git a/mysql-test/t/renamedb.test b/mysql-test/main/renamedb.test similarity index 100% rename from mysql-test/t/renamedb.test rename to mysql-test/main/renamedb.test diff --git a/mysql-test/r/reopen_temp_table.result b/mysql-test/main/reopen_temp_table.result similarity index 100% rename from mysql-test/r/reopen_temp_table.result rename to 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 similarity index 100% rename from mysql-test/t/reopen_temp_table.test rename to mysql-test/main/reopen_temp_table.test diff --git a/mysql-test/r/repair.result b/mysql-test/main/repair.result similarity index 100% rename from mysql-test/r/repair.result rename to mysql-test/main/repair.result diff --git a/mysql-test/t/repair.test b/mysql-test/main/repair.test similarity index 100% rename from mysql-test/t/repair.test rename to mysql-test/main/repair.test diff --git a/mysql-test/r/repair_symlink-5543.result b/mysql-test/main/repair_symlink-5543.result similarity index 100% rename from mysql-test/r/repair_symlink-5543.result rename to 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 similarity index 100% rename from mysql-test/t/repair_symlink-5543.test rename to mysql-test/main/repair_symlink-5543.test diff --git a/mysql-test/r/replace.result b/mysql-test/main/replace.result similarity index 100% rename from mysql-test/r/replace.result rename to mysql-test/main/replace.result diff --git a/mysql-test/t/replace.test b/mysql-test/main/replace.test similarity index 100% rename from mysql-test/t/replace.test rename to mysql-test/main/replace.test diff --git a/mysql-test/r/rollback.result b/mysql-test/main/rollback.result similarity index 100% rename from mysql-test/r/rollback.result rename to mysql-test/main/rollback.result diff --git a/mysql-test/t/rollback.test b/mysql-test/main/rollback.test similarity index 100% rename from mysql-test/t/rollback.test rename to mysql-test/main/rollback.test diff --git a/mysql-test/r/round.result b/mysql-test/main/round.result similarity index 100% rename from mysql-test/r/round.result rename to mysql-test/main/round.result diff --git a/mysql-test/t/round.test b/mysql-test/main/round.test similarity index 100% rename from mysql-test/t/round.test rename to mysql-test/main/round.test diff --git a/mysql-test/t/row-checksum-master.opt b/mysql-test/main/row-checksum-master.opt similarity index 100% rename from mysql-test/t/row-checksum-master.opt rename to 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 similarity index 100% rename from mysql-test/t/row-checksum-old-master.opt rename to 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 similarity index 100% rename from mysql-test/r/row-checksum-old.result rename to 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 similarity index 59% rename from mysql-test/t/row-checksum-old.test rename to 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 similarity index 100% rename from mysql-test/t/row-checksum.opt rename to mysql-test/main/row-checksum.opt diff --git a/mysql-test/r/row-checksum.result b/mysql-test/main/row-checksum.result similarity index 100% rename from mysql-test/r/row-checksum.result rename to mysql-test/main/row-checksum.result diff --git a/mysql-test/t/row-checksum.test b/mysql-test/main/row-checksum.test similarity index 100% rename from mysql-test/t/row-checksum.test rename to mysql-test/main/row-checksum.test diff --git a/mysql-test/r/row.result b/mysql-test/main/row.result similarity index 100% rename from mysql-test/r/row.result rename to mysql-test/main/row.result diff --git a/mysql-test/t/row.test b/mysql-test/main/row.test similarity index 100% rename from mysql-test/t/row.test rename to mysql-test/main/row.test diff --git a/mysql-test/r/rowid_order_innodb.result b/mysql-test/main/rowid_order_innodb.result similarity index 100% rename from mysql-test/r/rowid_order_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/rowid_order_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/rpl_mysqldump_slave.result rename to 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 similarity index 100% rename from mysql-test/t/rpl_mysqldump_slave.test rename to mysql-test/main/rpl_mysqldump_slave.test diff --git a/mysql-test/r/schema.result b/mysql-test/main/schema.result similarity index 100% rename from mysql-test/r/schema.result rename to mysql-test/main/schema.result diff --git a/mysql-test/t/schema.test b/mysql-test/main/schema.test similarity index 100% rename from mysql-test/t/schema.test rename to mysql-test/main/schema.test diff --git a/mysql-test/r/second_frac-9175.result b/mysql-test/main/second_frac-9175.result similarity index 100% rename from mysql-test/r/second_frac-9175.result rename to 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 similarity index 100% rename from mysql-test/t/second_frac-9175.test rename to 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 similarity index 100% rename from mysql-test/t/secure_file_priv_win-master.opt rename to 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 similarity index 100% rename from mysql-test/r/secure_file_priv_win.result rename to 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 similarity index 100% rename from mysql-test/t/secure_file_priv_win.test rename to mysql-test/main/secure_file_priv_win.test diff --git a/mysql-test/r/select.result b/mysql-test/main/select.result similarity index 100% rename from mysql-test/r/select.result rename to mysql-test/main/select.result diff --git a/mysql-test/t/select.test b/mysql-test/main/select.test similarity index 100% rename from mysql-test/t/select.test rename to mysql-test/main/select.test diff --git a/mysql-test/r/select_debug.result b/mysql-test/main/select_debug.result similarity index 100% rename from mysql-test/r/select_debug.result rename to mysql-test/main/select_debug.result diff --git a/mysql-test/t/select_debug.test b/mysql-test/main/select_debug.test similarity index 100% rename from mysql-test/t/select_debug.test rename to mysql-test/main/select_debug.test diff --git a/mysql-test/r/select_found.result b/mysql-test/main/select_found.result similarity index 100% rename from mysql-test/r/select_found.result rename to mysql-test/main/select_found.result diff --git a/mysql-test/t/select_found.test b/mysql-test/main/select_found.test similarity index 100% rename from mysql-test/t/select_found.test rename to mysql-test/main/select_found.test diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/main/select_jcl6.result similarity index 100% rename from mysql-test/r/select_jcl6.result rename to mysql-test/main/select_jcl6.result diff --git a/mysql-test/t/select_jcl6.test b/mysql-test/main/select_jcl6.test similarity index 96% rename from mysql-test/t/select_jcl6.test rename to 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 similarity index 100% rename from mysql-test/t/select_pkeycache-master.opt rename to mysql-test/main/select_pkeycache-master.opt diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/main/select_pkeycache.result similarity index 100% rename from mysql-test/r/select_pkeycache.result rename to mysql-test/main/select_pkeycache.result diff --git a/mysql-test/t/select_pkeycache.test b/mysql-test/main/select_pkeycache.test similarity index 89% rename from mysql-test/t/select_pkeycache.test rename to 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 similarity index 100% rename from mysql-test/r/select_safe.result rename to mysql-test/main/select_safe.result diff --git a/mysql-test/t/select_safe.test b/mysql-test/main/select_safe.test similarity index 100% rename from mysql-test/t/select_safe.test rename to mysql-test/main/select_safe.test diff --git a/mysql-test/r/selectivity.result b/mysql-test/main/selectivity.result similarity index 100% rename from mysql-test/r/selectivity.result rename to mysql-test/main/selectivity.result diff --git a/mysql-test/t/selectivity.test b/mysql-test/main/selectivity.test similarity index 100% rename from mysql-test/t/selectivity.test rename to mysql-test/main/selectivity.test diff --git a/mysql-test/r/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result similarity index 100% rename from mysql-test/r/selectivity_innodb.result rename to mysql-test/main/selectivity_innodb.result diff --git a/mysql-test/t/selectivity_innodb.test b/mysql-test/main/selectivity_innodb.test similarity index 100% rename from mysql-test/t/selectivity_innodb.test rename to mysql-test/main/selectivity_innodb.test diff --git a/mysql-test/r/selectivity_no_engine.result b/mysql-test/main/selectivity_no_engine.result similarity index 100% rename from mysql-test/r/selectivity_no_engine.result rename to 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 similarity index 100% rename from mysql-test/t/selectivity_no_engine.test rename to mysql-test/main/selectivity_no_engine.test diff --git a/mysql-test/r/servers.result b/mysql-test/main/servers.result similarity index 100% rename from mysql-test/r/servers.result rename to mysql-test/main/servers.result diff --git a/mysql-test/t/servers.test b/mysql-test/main/servers.test similarity index 100% rename from mysql-test/t/servers.test rename to 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 similarity index 100% rename from mysql-test/r/set_password_plugin-9835.result rename to 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 similarity index 100% rename from mysql-test/t/set_password_plugin-9835.test rename to mysql-test/main/set_password_plugin-9835.test diff --git a/mysql-test/r/set_statement.result b/mysql-test/main/set_statement.result similarity index 100% rename from mysql-test/r/set_statement.result rename to mysql-test/main/set_statement.result diff --git a/mysql-test/t/set_statement.test b/mysql-test/main/set_statement.test similarity index 100% rename from mysql-test/t/set_statement.test rename to mysql-test/main/set_statement.test diff --git a/mysql-test/r/set_statement_debug.result b/mysql-test/main/set_statement_debug.result similarity index 100% rename from mysql-test/r/set_statement_debug.result rename to 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 similarity index 100% rename from mysql-test/t/set_statement_debug.test rename to 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 similarity index 100% rename from mysql-test/r/set_statement_notembedded.result rename to 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 similarity index 100% rename from mysql-test/t/set_statement_notembedded.test rename to 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 similarity index 100% rename from mysql-test/r/set_statement_notembedded_binlog.result rename to 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 similarity index 100% rename from mysql-test/t/set_statement_notembedded_binlog.test rename to 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 similarity index 100% rename from mysql-test/r/set_statement_profiling.result rename to 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 similarity index 100% rename from mysql-test/t/set_statement_profiling.test rename to mysql-test/main/set_statement_profiling.test diff --git a/mysql-test/t/shm-master.opt b/mysql-test/main/shm-master.opt similarity index 100% rename from mysql-test/t/shm-master.opt rename to mysql-test/main/shm-master.opt diff --git a/mysql-test/r/shm.result b/mysql-test/main/shm.result similarity index 100% rename from mysql-test/r/shm.result rename to mysql-test/main/shm.result diff --git a/mysql-test/t/shm.test b/mysql-test/main/shm.test similarity index 100% rename from mysql-test/t/shm.test rename to mysql-test/main/shm.test diff --git a/mysql-test/r/show.result b/mysql-test/main/show.result similarity index 100% rename from mysql-test/r/show.result rename to mysql-test/main/show.result diff --git a/mysql-test/t/show.test b/mysql-test/main/show.test similarity index 100% rename from mysql-test/t/show.test rename to 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 similarity index 100% rename from mysql-test/r/show_bad_definer-5553.result rename to 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 similarity index 100% rename from mysql-test/t/show_bad_definer-5553.test rename to 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 similarity index 100% rename from mysql-test/t/show_check-master.opt rename to mysql-test/main/show_check-master.opt diff --git a/mysql-test/r/show_check.result b/mysql-test/main/show_check.result similarity index 100% rename from mysql-test/r/show_check.result rename to mysql-test/main/show_check.result diff --git a/mysql-test/t/show_check.test b/mysql-test/main/show_check.test similarity index 100% rename from mysql-test/t/show_check.test rename to mysql-test/main/show_check.test diff --git a/mysql-test/r/show_create_user.result b/mysql-test/main/show_create_user.result similarity index 100% rename from mysql-test/r/show_create_user.result rename to 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 similarity index 100% rename from mysql-test/t/show_create_user.test rename to mysql-test/main/show_create_user.test diff --git a/mysql-test/r/show_explain.result b/mysql-test/main/show_explain.result similarity index 100% rename from mysql-test/r/show_explain.result rename to mysql-test/main/show_explain.result diff --git a/mysql-test/t/show_explain.test b/mysql-test/main/show_explain.test similarity index 100% rename from mysql-test/t/show_explain.test rename to 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 similarity index 100% rename from mysql-test/r/show_explain_non_select.result rename to 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 similarity index 100% rename from mysql-test/t/show_explain_non_select.test rename to 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 similarity index 100% rename from mysql-test/r/show_explain_ps.result rename to 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 similarity index 100% rename from mysql-test/t/show_explain_ps.test rename to 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 similarity index 100% rename from mysql-test/r/show_function_with_pad_char_to_full_length.result rename to 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 similarity index 100% rename from mysql-test/t/show_function_with_pad_char_to_full_length.test rename to 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 similarity index 100% rename from mysql-test/r/show_grants_with_plugin-7985.result rename to 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 similarity index 100% rename from mysql-test/t/show_grants_with_plugin-7985.test rename to 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 similarity index 100% rename from mysql-test/r/show_profile.result rename to mysql-test/main/show_profile.result diff --git a/mysql-test/t/show_profile.test b/mysql-test/main/show_profile.test similarity index 100% rename from mysql-test/t/show_profile.test rename to 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 similarity index 100% rename from mysql-test/r/show_row_order-9226.result rename to 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 similarity index 100% rename from mysql-test/t/show_row_order-9226.test rename to mysql-test/main/show_row_order-9226.test diff --git a/mysql-test/r/shutdown.result b/mysql-test/main/shutdown.result similarity index 100% rename from mysql-test/r/shutdown.result rename to mysql-test/main/shutdown.result diff --git a/mysql-test/t/shutdown.test b/mysql-test/main/shutdown.test similarity index 100% rename from mysql-test/t/shutdown.test rename to mysql-test/main/shutdown.test diff --git a/mysql-test/r/sighup-6580.result b/mysql-test/main/sighup-6580.result similarity index 100% rename from mysql-test/r/sighup-6580.result rename to mysql-test/main/sighup-6580.result diff --git a/mysql-test/t/sighup-6580.test b/mysql-test/main/sighup-6580.test similarity index 100% rename from mysql-test/t/sighup-6580.test rename to mysql-test/main/sighup-6580.test diff --git a/mysql-test/r/signal.result b/mysql-test/main/signal.result similarity index 100% rename from mysql-test/r/signal.result rename to mysql-test/main/signal.result diff --git a/mysql-test/t/signal.test b/mysql-test/main/signal.test similarity index 100% rename from mysql-test/t/signal.test rename to mysql-test/main/signal.test diff --git a/mysql-test/r/signal_code.result b/mysql-test/main/signal_code.result similarity index 100% rename from mysql-test/r/signal_code.result rename to mysql-test/main/signal_code.result diff --git a/mysql-test/t/signal_code.test b/mysql-test/main/signal_code.test similarity index 100% rename from mysql-test/t/signal_code.test rename to mysql-test/main/signal_code.test diff --git a/mysql-test/r/signal_demo1.result b/mysql-test/main/signal_demo1.result similarity index 100% rename from mysql-test/r/signal_demo1.result rename to mysql-test/main/signal_demo1.result diff --git a/mysql-test/t/signal_demo1.test b/mysql-test/main/signal_demo1.test similarity index 100% rename from mysql-test/t/signal_demo1.test rename to mysql-test/main/signal_demo1.test diff --git a/mysql-test/r/signal_demo2.result b/mysql-test/main/signal_demo2.result similarity index 100% rename from mysql-test/r/signal_demo2.result rename to mysql-test/main/signal_demo2.result diff --git a/mysql-test/t/signal_demo2.test b/mysql-test/main/signal_demo2.test similarity index 100% rename from mysql-test/t/signal_demo2.test rename to mysql-test/main/signal_demo2.test diff --git a/mysql-test/r/signal_demo3.result b/mysql-test/main/signal_demo3.result similarity index 100% rename from mysql-test/r/signal_demo3.result rename to mysql-test/main/signal_demo3.result diff --git a/mysql-test/t/signal_demo3.test b/mysql-test/main/signal_demo3.test similarity index 100% rename from mysql-test/t/signal_demo3.test rename to mysql-test/main/signal_demo3.test diff --git a/mysql-test/r/signal_sqlmode.result b/mysql-test/main/signal_sqlmode.result similarity index 100% rename from mysql-test/r/signal_sqlmode.result rename to mysql-test/main/signal_sqlmode.result diff --git a/mysql-test/t/signal_sqlmode.test b/mysql-test/main/signal_sqlmode.test similarity index 100% rename from mysql-test/t/signal_sqlmode.test rename to mysql-test/main/signal_sqlmode.test diff --git a/mysql-test/r/simultaneous_assignment.result b/mysql-test/main/simultaneous_assignment.result similarity index 100% rename from mysql-test/r/simultaneous_assignment.result rename to mysql-test/main/simultaneous_assignment.result diff --git a/mysql-test/t/simultaneous_assignment.test b/mysql-test/main/simultaneous_assignment.test similarity index 100% rename from mysql-test/t/simultaneous_assignment.test rename to mysql-test/main/simultaneous_assignment.test diff --git a/mysql-test/r/single_delete_update.result b/mysql-test/main/single_delete_update.result similarity index 100% rename from mysql-test/r/single_delete_update.result rename to 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 similarity index 100% rename from mysql-test/t/single_delete_update.test rename to 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 similarity index 100% rename from mysql-test/r/single_delete_update_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/single_delete_update_innodb.test rename to 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 similarity index 100% rename from mysql-test/t/skip_grants-master.opt rename to mysql-test/main/skip_grants-master.opt diff --git a/mysql-test/r/skip_grants.result b/mysql-test/main/skip_grants.result similarity index 100% rename from mysql-test/r/skip_grants.result rename to mysql-test/main/skip_grants.result diff --git a/mysql-test/t/skip_grants.test b/mysql-test/main/skip_grants.test similarity index 100% rename from mysql-test/t/skip_grants.test rename to 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 similarity index 100% rename from mysql-test/t/skip_log_bin-master.opt rename to 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 similarity index 100% rename from mysql-test/r/skip_log_bin.result rename to 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 similarity index 100% rename from mysql-test/t/skip_log_bin.test rename to 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 similarity index 100% rename from mysql-test/t/skip_name_resolve-master.opt rename to 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 similarity index 100% rename from mysql-test/r/skip_name_resolve.result rename to 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 similarity index 100% rename from mysql-test/t/skip_name_resolve.test rename to 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 similarity index 100% rename from mysql-test/r/slowlog_enospace-10508.result rename to 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 similarity index 100% rename from mysql-test/t/slowlog_enospace-10508.test rename to 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 similarity index 100% rename from mysql-test/r/sp-anchor-row-type-cursor.result rename to 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 similarity index 100% rename from mysql-test/t/sp-anchor-row-type-cursor.test rename to 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 similarity index 100% rename from mysql-test/r/sp-anchor-row-type-table.result rename to 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 similarity index 100% rename from mysql-test/t/sp-anchor-row-type-table.test rename to 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 similarity index 100% rename from mysql-test/r/sp-anchor-type.result rename to 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 similarity index 100% rename from mysql-test/t/sp-anchor-type.test rename to mysql-test/main/sp-anchor-type.test diff --git a/mysql-test/r/sp-big.result b/mysql-test/main/sp-big.result similarity index 100% rename from mysql-test/r/sp-big.result rename to mysql-test/main/sp-big.result diff --git a/mysql-test/t/sp-big.test b/mysql-test/main/sp-big.test similarity index 100% rename from mysql-test/t/sp-big.test rename to mysql-test/main/sp-big.test diff --git a/mysql-test/r/sp-bugs.result b/mysql-test/main/sp-bugs.result similarity index 100% rename from mysql-test/r/sp-bugs.result rename to mysql-test/main/sp-bugs.result diff --git a/mysql-test/t/sp-bugs.test b/mysql-test/main/sp-bugs.test similarity index 100% rename from mysql-test/t/sp-bugs.test rename to mysql-test/main/sp-bugs.test diff --git a/mysql-test/r/sp-bugs2.result b/mysql-test/main/sp-bugs2.result similarity index 100% rename from mysql-test/r/sp-bugs2.result rename to mysql-test/main/sp-bugs2.result diff --git a/mysql-test/t/sp-bugs2.test b/mysql-test/main/sp-bugs2.test similarity index 100% rename from mysql-test/t/sp-bugs2.test rename to mysql-test/main/sp-bugs2.test diff --git a/mysql-test/r/sp-code.result b/mysql-test/main/sp-code.result similarity index 100% rename from mysql-test/r/sp-code.result rename to mysql-test/main/sp-code.result diff --git a/mysql-test/t/sp-code.test b/mysql-test/main/sp-code.test similarity index 100% rename from mysql-test/t/sp-code.test rename to mysql-test/main/sp-code.test diff --git a/mysql-test/r/sp-cursor.result b/mysql-test/main/sp-cursor.result similarity index 100% rename from mysql-test/r/sp-cursor.result rename to mysql-test/main/sp-cursor.result diff --git a/mysql-test/t/sp-cursor.test b/mysql-test/main/sp-cursor.test similarity index 100% rename from mysql-test/t/sp-cursor.test rename to mysql-test/main/sp-cursor.test diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/main/sp-destruct.result similarity index 100% rename from mysql-test/r/sp-destruct.result rename to mysql-test/main/sp-destruct.result diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/main/sp-destruct.test similarity index 100% rename from mysql-test/t/sp-destruct.test rename to mysql-test/main/sp-destruct.test diff --git a/mysql-test/r/sp-dynamic.result b/mysql-test/main/sp-dynamic.result similarity index 100% rename from mysql-test/r/sp-dynamic.result rename to mysql-test/main/sp-dynamic.result diff --git a/mysql-test/t/sp-dynamic.test b/mysql-test/main/sp-dynamic.test similarity index 100% rename from mysql-test/t/sp-dynamic.test rename to mysql-test/main/sp-dynamic.test diff --git a/mysql-test/r/sp-error.result b/mysql-test/main/sp-error.result similarity index 100% rename from mysql-test/r/sp-error.result rename to mysql-test/main/sp-error.result diff --git a/mysql-test/t/sp-error.test b/mysql-test/main/sp-error.test similarity index 100% rename from mysql-test/t/sp-error.test rename to mysql-test/main/sp-error.test diff --git a/mysql-test/r/sp-fib.result b/mysql-test/main/sp-fib.result similarity index 100% rename from mysql-test/r/sp-fib.result rename to mysql-test/main/sp-fib.result diff --git a/mysql-test/t/sp-fib.test b/mysql-test/main/sp-fib.test similarity index 100% rename from mysql-test/t/sp-fib.test rename to mysql-test/main/sp-fib.test diff --git a/mysql-test/r/sp-for-loop.result b/mysql-test/main/sp-for-loop.result similarity index 100% rename from mysql-test/r/sp-for-loop.result rename to 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 similarity index 100% rename from mysql-test/t/sp-for-loop.test rename to mysql-test/main/sp-for-loop.test diff --git a/mysql-test/r/sp-group.result b/mysql-test/main/sp-group.result similarity index 100% rename from mysql-test/r/sp-group.result rename to mysql-test/main/sp-group.result diff --git a/mysql-test/t/sp-group.test b/mysql-test/main/sp-group.test similarity index 100% rename from mysql-test/t/sp-group.test rename to mysql-test/main/sp-group.test diff --git a/mysql-test/r/sp-innodb.result b/mysql-test/main/sp-innodb.result similarity index 100% rename from mysql-test/r/sp-innodb.result rename to mysql-test/main/sp-innodb.result diff --git a/mysql-test/t/sp-innodb.test b/mysql-test/main/sp-innodb.test similarity index 100% rename from mysql-test/t/sp-innodb.test rename to mysql-test/main/sp-innodb.test diff --git a/mysql-test/r/sp-lock.result b/mysql-test/main/sp-lock.result similarity index 100% rename from mysql-test/r/sp-lock.result rename to mysql-test/main/sp-lock.result diff --git a/mysql-test/t/sp-lock.test b/mysql-test/main/sp-lock.test similarity index 100% rename from mysql-test/t/sp-lock.test rename to mysql-test/main/sp-lock.test diff --git a/mysql-test/r/sp-no-code.result b/mysql-test/main/sp-no-code.result similarity index 100% rename from mysql-test/r/sp-no-code.result rename to 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 similarity index 100% rename from mysql-test/t/sp-no-code.test rename to mysql-test/main/sp-no-code.test diff --git a/mysql-test/r/sp-prelocking.result b/mysql-test/main/sp-prelocking.result similarity index 100% rename from mysql-test/r/sp-prelocking.result rename to mysql-test/main/sp-prelocking.result diff --git a/mysql-test/t/sp-prelocking.test b/mysql-test/main/sp-prelocking.test similarity index 100% rename from mysql-test/t/sp-prelocking.test rename to 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 similarity index 100% rename from mysql-test/t/sp-row-vs-var.inc rename to mysql-test/main/sp-row-vs-var.inc diff --git a/mysql-test/r/sp-row.result b/mysql-test/main/sp-row.result similarity index 100% rename from mysql-test/r/sp-row.result rename to mysql-test/main/sp-row.result diff --git a/mysql-test/t/sp-row.test b/mysql-test/main/sp-row.test similarity index 100% rename from mysql-test/t/sp-row.test rename to 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 similarity index 100% rename from mysql-test/r/sp-security-anchor-type.result rename to 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 similarity index 100% rename from mysql-test/t/sp-security-anchor-type.test rename to mysql-test/main/sp-security-anchor-type.test diff --git a/mysql-test/r/sp-security.result b/mysql-test/main/sp-security.result similarity index 100% rename from mysql-test/r/sp-security.result rename to mysql-test/main/sp-security.result diff --git a/mysql-test/t/sp-security.test b/mysql-test/main/sp-security.test similarity index 100% rename from mysql-test/t/sp-security.test rename to mysql-test/main/sp-security.test diff --git a/mysql-test/r/sp-threads.result b/mysql-test/main/sp-threads.result similarity index 100% rename from mysql-test/r/sp-threads.result rename to mysql-test/main/sp-threads.result diff --git a/mysql-test/t/sp-threads.test b/mysql-test/main/sp-threads.test similarity index 100% rename from mysql-test/t/sp-threads.test rename to mysql-test/main/sp-threads.test diff --git a/mysql-test/r/sp-ucs2.result b/mysql-test/main/sp-ucs2.result similarity index 100% rename from mysql-test/r/sp-ucs2.result rename to mysql-test/main/sp-ucs2.result diff --git a/mysql-test/t/sp-ucs2.test b/mysql-test/main/sp-ucs2.test similarity index 100% rename from mysql-test/t/sp-ucs2.test rename to mysql-test/main/sp-ucs2.test diff --git a/mysql-test/r/sp-vars.result b/mysql-test/main/sp-vars.result similarity index 100% rename from mysql-test/r/sp-vars.result rename to mysql-test/main/sp-vars.result diff --git a/mysql-test/t/sp-vars.test b/mysql-test/main/sp-vars.test similarity index 100% rename from mysql-test/t/sp-vars.test rename to mysql-test/main/sp-vars.test diff --git a/mysql-test/r/sp.result b/mysql-test/main/sp.result similarity index 100% rename from mysql-test/r/sp.result rename to mysql-test/main/sp.result diff --git a/mysql-test/t/sp.test b/mysql-test/main/sp.test similarity index 100% rename from mysql-test/t/sp.test rename to mysql-test/main/sp.test diff --git a/mysql-test/r/sp_gis.result b/mysql-test/main/sp_gis.result similarity index 100% rename from mysql-test/r/sp_gis.result rename to mysql-test/main/sp_gis.result diff --git a/mysql-test/t/sp_gis.test b/mysql-test/main/sp_gis.test similarity index 100% rename from mysql-test/t/sp_gis.test rename to mysql-test/main/sp_gis.test diff --git a/mysql-test/r/sp_missing_4665.result b/mysql-test/main/sp_missing_4665.result similarity index 100% rename from mysql-test/r/sp_missing_4665.result rename to 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 similarity index 100% rename from mysql-test/t/sp_missing_4665.test rename to mysql-test/main/sp_missing_4665.test diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/main/sp_notembedded.result similarity index 100% rename from mysql-test/r/sp_notembedded.result rename to mysql-test/main/sp_notembedded.result diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/main/sp_notembedded.test similarity index 100% rename from mysql-test/t/sp_notembedded.test rename to mysql-test/main/sp_notembedded.test diff --git a/mysql-test/r/sp_stress_case.result b/mysql-test/main/sp_stress_case.result similarity index 100% rename from mysql-test/r/sp_stress_case.result rename to 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 similarity index 100% rename from mysql-test/t/sp_stress_case.test rename to mysql-test/main/sp_stress_case.test diff --git a/mysql-test/r/sp_sync.result b/mysql-test/main/sp_sync.result similarity index 100% rename from mysql-test/r/sp_sync.result rename to mysql-test/main/sp_sync.result diff --git a/mysql-test/t/sp_sync.test b/mysql-test/main/sp_sync.test similarity index 100% rename from mysql-test/t/sp_sync.test rename to mysql-test/main/sp_sync.test diff --git a/mysql-test/r/sp_trans.result b/mysql-test/main/sp_trans.result similarity index 100% rename from mysql-test/r/sp_trans.result rename to mysql-test/main/sp_trans.result diff --git a/mysql-test/t/sp_trans.test b/mysql-test/main/sp_trans.test similarity index 100% rename from mysql-test/t/sp_trans.test rename to mysql-test/main/sp_trans.test diff --git a/mysql-test/r/sp_trans_log.result b/mysql-test/main/sp_trans_log.result similarity index 100% rename from mysql-test/r/sp_trans_log.result rename to 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 similarity index 100% rename from mysql-test/t/sp_trans_log.test rename to mysql-test/main/sp_trans_log.test diff --git a/mysql-test/r/sql_mode.result b/mysql-test/main/sql_mode.result similarity index 100% rename from mysql-test/r/sql_mode.result rename to mysql-test/main/sql_mode.result diff --git a/mysql-test/t/sql_mode.test b/mysql-test/main/sql_mode.test similarity index 100% rename from mysql-test/t/sql_mode.test rename to mysql-test/main/sql_mode.test diff --git a/mysql-test/r/ssl-big.result b/mysql-test/main/ssl-big.result similarity index 100% rename from mysql-test/r/ssl-big.result rename to mysql-test/main/ssl-big.result diff --git a/mysql-test/t/ssl-big.test b/mysql-test/main/ssl-big.test similarity index 100% rename from mysql-test/t/ssl-big.test rename to 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 similarity index 100% rename from mysql-test/r/ssl-crl-revoked-crl.result rename to mysql-test/main/ssl-crl-revoked-crl.result diff --git a/mysql-test/r/ssl.result b/mysql-test/main/ssl.result similarity index 100% rename from mysql-test/r/ssl.result rename to mysql-test/main/ssl.result diff --git a/mysql-test/t/ssl.test b/mysql-test/main/ssl.test similarity index 100% rename from mysql-test/t/ssl.test rename to mysql-test/main/ssl.test diff --git a/mysql-test/r/ssl_7937,nossl.result b/mysql-test/main/ssl_7937,nossl.result similarity index 100% rename from mysql-test/r/ssl_7937,nossl.result rename to mysql-test/main/ssl_7937,nossl.result diff --git a/mysql-test/t/ssl_7937.combinations b/mysql-test/main/ssl_7937.combinations similarity index 100% rename from mysql-test/t/ssl_7937.combinations rename to mysql-test/main/ssl_7937.combinations diff --git a/mysql-test/r/ssl_7937.result b/mysql-test/main/ssl_7937.result similarity index 100% rename from mysql-test/r/ssl_7937.result rename to mysql-test/main/ssl_7937.result diff --git a/mysql-test/t/ssl_7937.test b/mysql-test/main/ssl_7937.test similarity index 100% rename from mysql-test/t/ssl_7937.test rename to 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 similarity index 100% rename from mysql-test/t/ssl_8k_key-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ssl_8k_key.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_8k_key.test rename to 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 similarity index 100% rename from mysql-test/r/ssl_and_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_and_innodb.test rename to mysql-test/main/ssl_and_innodb.test diff --git a/mysql-test/r/ssl_ca.result b/mysql-test/main/ssl_ca.result similarity index 100% rename from mysql-test/r/ssl_ca.result rename to mysql-test/main/ssl_ca.result diff --git a/mysql-test/t/ssl_ca.test b/mysql-test/main/ssl_ca.test similarity index 100% rename from mysql-test/t/ssl_ca.test rename to mysql-test/main/ssl_ca.test diff --git a/mysql-test/r/ssl_cert_verify.result b/mysql-test/main/ssl_cert_verify.result similarity index 100% rename from mysql-test/r/ssl_cert_verify.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_cert_verify.test rename to 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 similarity index 100% rename from mysql-test/t/ssl_cipher-master.opt rename to mysql-test/main/ssl_cipher-master.opt diff --git a/mysql-test/r/ssl_cipher.result b/mysql-test/main/ssl_cipher.result similarity index 100% rename from mysql-test/r/ssl_cipher.result rename to mysql-test/main/ssl_cipher.result diff --git a/mysql-test/t/ssl_cipher.test b/mysql-test/main/ssl_cipher.test similarity index 100% rename from mysql-test/t/ssl_cipher.test rename to mysql-test/main/ssl_cipher.test diff --git a/mysql-test/r/ssl_compress.result b/mysql-test/main/ssl_compress.result similarity index 100% rename from mysql-test/r/ssl_compress.result rename to mysql-test/main/ssl_compress.result diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/main/ssl_compress.test similarity index 100% rename from mysql-test/t/ssl_compress.test rename to mysql-test/main/ssl_compress.test diff --git a/mysql-test/r/ssl_connect.result b/mysql-test/main/ssl_connect.result similarity index 100% rename from mysql-test/r/ssl_connect.result rename to mysql-test/main/ssl_connect.result diff --git a/mysql-test/t/ssl_connect.test b/mysql-test/main/ssl_connect.test similarity index 100% rename from mysql-test/t/ssl_connect.test rename to mysql-test/main/ssl_connect.test diff --git a/mysql-test/t/ssl_crl-master.opt b/mysql-test/main/ssl_crl-master.opt similarity index 100% rename from mysql-test/t/ssl_crl-master.opt rename to mysql-test/main/ssl_crl-master.opt diff --git a/mysql-test/r/ssl_crl.result b/mysql-test/main/ssl_crl.result similarity index 100% rename from mysql-test/r/ssl_crl.result rename to mysql-test/main/ssl_crl.result diff --git a/mysql-test/t/ssl_crl.test b/mysql-test/main/ssl_crl.test similarity index 100% rename from mysql-test/t/ssl_crl.test rename to 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 similarity index 100% rename from mysql-test/t/ssl_crl_clients-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ssl_crl_clients-valid.result rename to 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 similarity index 100% rename from mysql-test/r/ssl_crl_clients.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_crl_clients.test rename to 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 similarity index 100% rename from mysql-test/t/ssl_crl_clients_valid-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ssl_crl_clients_valid.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_crl_clients_valid.test rename to 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 similarity index 100% rename from mysql-test/t/ssl_crl_clrpath-master.opt rename to 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 similarity index 100% rename from mysql-test/r/ssl_crl_clrpath.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_crl_clrpath.test rename to 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 similarity index 100% rename from mysql-test/t/ssl_timeout-9836.opt rename to 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 similarity index 100% rename from mysql-test/r/ssl_timeout-9836.result rename to 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 similarity index 100% rename from mysql-test/t/ssl_timeout-9836.test rename to mysql-test/main/ssl_timeout-9836.test diff --git a/mysql-test/r/ssl_timeout.result b/mysql-test/main/ssl_timeout.result similarity index 100% rename from mysql-test/r/ssl_timeout.result rename to mysql-test/main/ssl_timeout.result diff --git a/mysql-test/t/ssl_timeout.test b/mysql-test/main/ssl_timeout.test similarity index 100% rename from mysql-test/t/ssl_timeout.test rename to mysql-test/main/ssl_timeout.test diff --git a/mysql-test/r/stack-crash.result b/mysql-test/main/stack-crash.result similarity index 100% rename from mysql-test/r/stack-crash.result rename to mysql-test/main/stack-crash.result diff --git a/mysql-test/t/stack-crash.test b/mysql-test/main/stack-crash.test similarity index 100% rename from mysql-test/t/stack-crash.test rename to mysql-test/main/stack-crash.test diff --git a/mysql-test/r/stat_tables-enospc.result b/mysql-test/main/stat_tables-enospc.result similarity index 100% rename from mysql-test/r/stat_tables-enospc.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables-enospc.test rename to mysql-test/main/stat_tables-enospc.test diff --git a/mysql-test/r/stat_tables.result b/mysql-test/main/stat_tables.result similarity index 100% rename from mysql-test/r/stat_tables.result rename to mysql-test/main/stat_tables.result diff --git a/mysql-test/t/stat_tables.test b/mysql-test/main/stat_tables.test similarity index 100% rename from mysql-test/t/stat_tables.test rename to mysql-test/main/stat_tables.test diff --git a/mysql-test/r/stat_tables_disabled.result b/mysql-test/main/stat_tables_disabled.result similarity index 100% rename from mysql-test/r/stat_tables_disabled.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_disabled.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_innodb_debug.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_innodb_debug.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_myisam_debug.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_myisam_debug.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_par.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_par.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_par_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_par_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_partition.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_partition.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_rbr.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_rbr.test rename to 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 similarity index 100% rename from mysql-test/r/stat_tables_repl.result rename to 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 similarity index 100% rename from mysql-test/t/stat_tables_repl.test rename to mysql-test/main/stat_tables_repl.test diff --git a/mysql-test/r/statistics.result b/mysql-test/main/statistics.result similarity index 100% rename from mysql-test/r/statistics.result rename to mysql-test/main/statistics.result diff --git a/mysql-test/t/statistics.test b/mysql-test/main/statistics.test similarity index 100% rename from mysql-test/t/statistics.test rename to 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 similarity index 100% rename from mysql-test/r/statistics_index_crash-7362.result rename to 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 similarity index 100% rename from mysql-test/t/statistics_index_crash-7362.test rename to mysql-test/main/statistics_index_crash-7362.test diff --git a/mysql-test/t/status-master.opt b/mysql-test/main/status-master.opt similarity index 100% rename from mysql-test/t/status-master.opt rename to mysql-test/main/status-master.opt diff --git a/mysql-test/r/status.result b/mysql-test/main/status.result similarity index 100% rename from mysql-test/r/status.result rename to mysql-test/main/status.result diff --git a/mysql-test/t/status.test b/mysql-test/main/status.test similarity index 100% rename from mysql-test/t/status.test rename to mysql-test/main/status.test diff --git a/mysql-test/r/status2.result b/mysql-test/main/status2.result similarity index 100% rename from mysql-test/r/status2.result rename to mysql-test/main/status2.result diff --git a/mysql-test/t/status2.test b/mysql-test/main/status2.test similarity index 100% rename from mysql-test/t/status2.test rename to mysql-test/main/status2.test diff --git a/mysql-test/r/status_bug17954.result b/mysql-test/main/status_bug17954.result similarity index 100% rename from mysql-test/r/status_bug17954.result rename to mysql-test/main/status_bug17954.result diff --git a/mysql-test/t/status_bug17954.test b/mysql-test/main/status_bug17954.test similarity index 100% rename from mysql-test/t/status_bug17954.test rename to 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 similarity index 100% rename from mysql-test/r/str_to_datetime_457.result rename to 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 similarity index 100% rename from mysql-test/t/str_to_datetime_457.test rename to mysql-test/main/str_to_datetime_457.test diff --git a/mysql-test/t/strict-master.opt b/mysql-test/main/strict-master.opt similarity index 100% rename from mysql-test/t/strict-master.opt rename to mysql-test/main/strict-master.opt diff --git a/mysql-test/r/strict.result b/mysql-test/main/strict.result similarity index 100% rename from mysql-test/r/strict.result rename to mysql-test/main/strict.result diff --git a/mysql-test/t/strict.test b/mysql-test/main/strict.test similarity index 100% rename from mysql-test/t/strict.test rename to mysql-test/main/strict.test diff --git a/mysql-test/r/strict_autoinc_1myisam.result b/mysql-test/main/strict_autoinc_1myisam.result similarity index 100% rename from mysql-test/r/strict_autoinc_1myisam.result rename to 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 similarity index 100% rename from mysql-test/t/strict_autoinc_1myisam.test rename to 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 similarity index 100% rename from mysql-test/r/strict_autoinc_2innodb.result rename to 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 similarity index 100% rename from mysql-test/t/strict_autoinc_2innodb.test rename to 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 similarity index 100% rename from mysql-test/r/strict_autoinc_3heap.result rename to 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 similarity index 100% rename from mysql-test/t/strict_autoinc_3heap.test rename to mysql-test/main/strict_autoinc_3heap.test diff --git a/mysql-test/r/subselect.result b/mysql-test/main/subselect.result similarity index 100% rename from mysql-test/r/subselect.result rename to mysql-test/main/subselect.result diff --git a/mysql-test/t/subselect.test b/mysql-test/main/subselect.test similarity index 100% rename from mysql-test/t/subselect.test rename to mysql-test/main/subselect.test diff --git a/mysql-test/r/subselect2.result b/mysql-test/main/subselect2.result similarity index 100% rename from mysql-test/r/subselect2.result rename to mysql-test/main/subselect2.result diff --git a/mysql-test/t/subselect2.test b/mysql-test/main/subselect2.test similarity index 100% rename from mysql-test/t/subselect2.test rename to mysql-test/main/subselect2.test diff --git a/mysql-test/r/subselect3.result b/mysql-test/main/subselect3.result similarity index 100% rename from mysql-test/r/subselect3.result rename to mysql-test/main/subselect3.result diff --git a/mysql-test/t/subselect3.test b/mysql-test/main/subselect3.test similarity index 100% rename from mysql-test/t/subselect3.test rename to mysql-test/main/subselect3.test diff --git a/mysql-test/r/subselect3_jcl6.result b/mysql-test/main/subselect3_jcl6.result similarity index 100% rename from mysql-test/r/subselect3_jcl6.result rename to mysql-test/main/subselect3_jcl6.result diff --git a/mysql-test/t/subselect3_jcl6.test b/mysql-test/main/subselect3_jcl6.test similarity index 95% rename from mysql-test/t/subselect3_jcl6.test rename to 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 similarity index 100% rename from mysql-test/r/subselect4.result rename to mysql-test/main/subselect4.result diff --git a/mysql-test/t/subselect4.test b/mysql-test/main/subselect4.test similarity index 100% rename from mysql-test/t/subselect4.test rename to mysql-test/main/subselect4.test diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/main/subselect_cache.result similarity index 100% rename from mysql-test/r/subselect_cache.result rename to mysql-test/main/subselect_cache.result diff --git a/mysql-test/t/subselect_cache.test b/mysql-test/main/subselect_cache.test similarity index 100% rename from mysql-test/t/subselect_cache.test rename to mysql-test/main/subselect_cache.test diff --git a/mysql-test/r/subselect_debug.result b/mysql-test/main/subselect_debug.result similarity index 100% rename from mysql-test/r/subselect_debug.result rename to mysql-test/main/subselect_debug.result diff --git a/mysql-test/t/subselect_debug.test b/mysql-test/main/subselect_debug.test similarity index 100% rename from mysql-test/t/subselect_debug.test rename to mysql-test/main/subselect_debug.test diff --git a/mysql-test/r/subselect_exists2in.result b/mysql-test/main/subselect_exists2in.result similarity index 100% rename from mysql-test/r/subselect_exists2in.result rename to mysql-test/main/subselect_exists2in.result diff --git a/mysql-test/t/subselect_exists2in.test b/mysql-test/main/subselect_exists2in.test similarity index 100% rename from mysql-test/t/subselect_exists2in.test rename to mysql-test/main/subselect_exists2in.test diff --git a/mysql-test/r/subselect_exists2in_costmat.result b/mysql-test/main/subselect_exists2in_costmat.result similarity index 100% rename from mysql-test/r/subselect_exists2in_costmat.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_exists2in_costmat.test rename to mysql-test/main/subselect_exists2in_costmat.test diff --git a/mysql-test/r/subselect_extra.result b/mysql-test/main/subselect_extra.result similarity index 100% rename from mysql-test/r/subselect_extra.result rename to mysql-test/main/subselect_extra.result diff --git a/mysql-test/t/subselect_extra.test b/mysql-test/main/subselect_extra.test similarity index 100% rename from mysql-test/t/subselect_extra.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_extra_no_semijoin.result rename to 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 similarity index 89% rename from mysql-test/t/subselect_extra_no_semijoin.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_gis.result rename to mysql-test/main/subselect_gis.result diff --git a/mysql-test/t/subselect_gis.test b/mysql-test/main/subselect_gis.test similarity index 100% rename from mysql-test/t/subselect_gis.test rename to mysql-test/main/subselect_gis.test diff --git a/mysql-test/r/subselect_innodb.result b/mysql-test/main/subselect_innodb.result similarity index 100% rename from mysql-test/r/subselect_innodb.result rename to mysql-test/main/subselect_innodb.result diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/main/subselect_innodb.test similarity index 100% rename from mysql-test/t/subselect_innodb.test rename to mysql-test/main/subselect_innodb.test diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/main/subselect_mat.result similarity index 100% rename from mysql-test/r/subselect_mat.result rename to mysql-test/main/subselect_mat.result diff --git a/mysql-test/t/subselect_mat.test b/mysql-test/main/subselect_mat.test similarity index 99% rename from mysql-test/t/subselect_mat.test rename to 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 similarity index 100% rename from mysql-test/t/subselect_mat_cost-master.opt rename to 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 similarity index 100% rename from mysql-test/r/subselect_mat_cost.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_mat_cost.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_mat_cost_bugs.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_mat_cost_bugs.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_no_exists_to_in.result rename to 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 similarity index 90% rename from mysql-test/t/subselect_no_exists_to_in.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_no_mat.result rename to 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 similarity index 94% rename from mysql-test/t/subselect_no_mat.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_no_opts.result rename to 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 similarity index 93% rename from mysql-test/t/subselect_no_opts.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_no_scache.result rename to 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 similarity index 93% rename from mysql-test/t/subselect_no_scache.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_no_semijoin.result rename to 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 similarity index 93% rename from mysql-test/t/subselect_no_semijoin.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_notembedded.result rename to mysql-test/main/subselect_notembedded.result diff --git a/mysql-test/t/subselect_notembedded.test b/mysql-test/main/subselect_notembedded.test similarity index 100% rename from mysql-test/t/subselect_notembedded.test rename to mysql-test/main/subselect_notembedded.test diff --git a/mysql-test/r/subselect_nulls.result b/mysql-test/main/subselect_nulls.result similarity index 100% rename from mysql-test/r/subselect_nulls.result rename to mysql-test/main/subselect_nulls.result diff --git a/mysql-test/t/subselect_nulls.test b/mysql-test/main/subselect_nulls.test similarity index 100% rename from mysql-test/t/subselect_nulls.test rename to mysql-test/main/subselect_nulls.test diff --git a/mysql-test/r/subselect_partial_match.result b/mysql-test/main/subselect_partial_match.result similarity index 100% rename from mysql-test/r/subselect_partial_match.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_partial_match.test rename to mysql-test/main/subselect_partial_match.test diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/main/subselect_sj.result similarity index 100% rename from mysql-test/r/subselect_sj.result rename to mysql-test/main/subselect_sj.result diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/main/subselect_sj.test similarity index 100% rename from mysql-test/t/subselect_sj.test rename to mysql-test/main/subselect_sj.test diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/main/subselect_sj2.result similarity index 100% rename from mysql-test/r/subselect_sj2.result rename to mysql-test/main/subselect_sj2.result diff --git a/mysql-test/t/subselect_sj2.test b/mysql-test/main/subselect_sj2.test similarity index 100% rename from mysql-test/t/subselect_sj2.test rename to mysql-test/main/subselect_sj2.test diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/main/subselect_sj2_jcl6.result similarity index 100% rename from mysql-test/r/subselect_sj2_jcl6.result rename to 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 similarity index 99% rename from mysql-test/t/subselect_sj2_jcl6.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_sj2_mat.result rename to 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 similarity index 99% rename from mysql-test/t/subselect_sj2_mat.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_sj_aria.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_sj_aria.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_sj_jcl6.result rename to 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 similarity index 99% rename from mysql-test/t/subselect_sj_jcl6.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_sj_mat.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_sj_mat.test rename to 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 similarity index 100% rename from mysql-test/r/subselect_sj_nonmerged.result rename to 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 similarity index 100% rename from mysql-test/t/subselect_sj_nonmerged.test rename to 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 similarity index 100% rename from mysql-test/r/sum_distinct-big.result rename to 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 similarity index 100% rename from mysql-test/t/sum_distinct-big.test rename to mysql-test/main/sum_distinct-big.test diff --git a/mysql-test/r/sum_distinct.result b/mysql-test/main/sum_distinct.result similarity index 100% rename from mysql-test/r/sum_distinct.result rename to mysql-test/main/sum_distinct.result diff --git a/mysql-test/t/sum_distinct.test b/mysql-test/main/sum_distinct.test similarity index 100% rename from mysql-test/t/sum_distinct.test rename to mysql-test/main/sum_distinct.test diff --git a/mysql-test/r/symlink-aria-11902.result b/mysql-test/main/symlink-aria-11902.result similarity index 100% rename from mysql-test/r/symlink-aria-11902.result rename to 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 similarity index 100% rename from mysql-test/t/symlink-aria-11902.test rename to 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 similarity index 100% rename from mysql-test/r/symlink-myisam-11902.result rename to 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 similarity index 100% rename from mysql-test/t/symlink-myisam-11902.test rename to mysql-test/main/symlink-myisam-11902.test diff --git a/mysql-test/r/symlink.result b/mysql-test/main/symlink.result similarity index 100% rename from mysql-test/r/symlink.result rename to mysql-test/main/symlink.result diff --git a/mysql-test/t/symlink.test b/mysql-test/main/symlink.test similarity index 100% rename from mysql-test/t/symlink.test rename to mysql-test/main/symlink.test diff --git a/mysql-test/r/synchronization.result b/mysql-test/main/synchronization.result similarity index 100% rename from mysql-test/r/synchronization.result rename to mysql-test/main/synchronization.result diff --git a/mysql-test/t/synchronization.test b/mysql-test/main/synchronization.test similarity index 100% rename from mysql-test/t/synchronization.test rename to 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 similarity index 100% rename from mysql-test/t/sysdate_is_now-master.opt rename to 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 similarity index 100% rename from mysql-test/r/sysdate_is_now.result rename to 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 similarity index 100% rename from mysql-test/t/sysdate_is_now.test rename to 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 similarity index 100% rename from mysql-test/r/system_mysql_db.result rename to 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 similarity index 100% rename from mysql-test/t/system_mysql_db.test rename to 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 similarity index 100% rename from mysql-test/r/system_mysql_db_fix40123.result rename to 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 similarity index 100% rename from mysql-test/t/system_mysql_db_fix40123.test rename to 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 similarity index 100% rename from mysql-test/r/system_mysql_db_fix50030.result rename to 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 similarity index 100% rename from mysql-test/t/system_mysql_db_fix50030.test rename to 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 similarity index 100% rename from mysql-test/r/system_mysql_db_fix50117.result rename to 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 similarity index 100% rename from mysql-test/t/system_mysql_db_fix50117.test rename to 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 similarity index 100% rename from mysql-test/r/system_mysql_db_refs.result rename to 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 similarity index 100% rename from mysql-test/t/system_mysql_db_refs.test rename to mysql-test/main/system_mysql_db_refs.test diff --git a/mysql-test/r/table_elim.result b/mysql-test/main/table_elim.result similarity index 100% rename from mysql-test/r/table_elim.result rename to mysql-test/main/table_elim.result diff --git a/mysql-test/t/table_elim.test b/mysql-test/main/table_elim.test similarity index 100% rename from mysql-test/t/table_elim.test rename to mysql-test/main/table_elim.test diff --git a/mysql-test/r/table_elim_debug.result b/mysql-test/main/table_elim_debug.result similarity index 100% rename from mysql-test/r/table_elim_debug.result rename to 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 similarity index 100% rename from mysql-test/t/table_elim_debug.test rename to 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 similarity index 100% rename from mysql-test/r/table_keyinfo-6838.result rename to 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 similarity index 100% rename from mysql-test/t/table_keyinfo-6838.test rename to 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 similarity index 100% rename from mysql-test/r/table_options-5867.result rename to 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 similarity index 100% rename from mysql-test/t/table_options-5867.test rename to mysql-test/main/table_options-5867.test diff --git a/mysql-test/r/table_options.result b/mysql-test/main/table_options.result similarity index 100% rename from mysql-test/r/table_options.result rename to mysql-test/main/table_options.result diff --git a/mysql-test/t/table_options.test b/mysql-test/main/table_options.test similarity index 100% rename from mysql-test/t/table_options.test rename to mysql-test/main/table_options.test diff --git a/mysql-test/r/table_value_constr.result b/mysql-test/main/table_value_constr.result similarity index 100% rename from mysql-test/r/table_value_constr.result rename to 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 similarity index 100% rename from mysql-test/t/table_value_constr.test rename to mysql-test/main/table_value_constr.test diff --git a/mysql-test/r/tablelock.result b/mysql-test/main/tablelock.result similarity index 100% rename from mysql-test/r/tablelock.result rename to mysql-test/main/tablelock.result diff --git a/mysql-test/t/tablelock.test b/mysql-test/main/tablelock.test similarity index 100% rename from mysql-test/t/tablelock.test rename to mysql-test/main/tablelock.test diff --git a/mysql-test/r/tablespace.result b/mysql-test/main/tablespace.result similarity index 100% rename from mysql-test/r/tablespace.result rename to mysql-test/main/tablespace.result diff --git a/mysql-test/t/tablespace.test b/mysql-test/main/tablespace.test similarity index 100% rename from mysql-test/t/tablespace.test rename to mysql-test/main/tablespace.test diff --git a/mysql-test/r/tc_heuristic_recover.result b/mysql-test/main/tc_heuristic_recover.result similarity index 100% rename from mysql-test/r/tc_heuristic_recover.result rename to 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 similarity index 100% rename from mysql-test/t/tc_heuristic_recover.test rename to 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 similarity index 100% rename from mysql-test/t/temp_table-master.opt rename to mysql-test/main/temp_table-master.opt diff --git a/mysql-test/r/temp_table.result b/mysql-test/main/temp_table.result similarity index 100% rename from mysql-test/r/temp_table.result rename to mysql-test/main/temp_table.result diff --git a/mysql-test/t/temp_table.test b/mysql-test/main/temp_table.test similarity index 100% rename from mysql-test/t/temp_table.test rename to mysql-test/main/temp_table.test diff --git a/mysql-test/r/temp_table_frm.result b/mysql-test/main/temp_table_frm.result similarity index 100% rename from mysql-test/r/temp_table_frm.result rename to 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 similarity index 100% rename from mysql-test/t/temp_table_frm.test rename to mysql-test/main/temp_table_frm.test diff --git a/mysql-test/r/temporal_literal.result b/mysql-test/main/temporal_literal.result similarity index 100% rename from mysql-test/r/temporal_literal.result rename to mysql-test/main/temporal_literal.result diff --git a/mysql-test/t/temporal_literal.test b/mysql-test/main/temporal_literal.test similarity index 100% rename from mysql-test/t/temporal_literal.test rename to mysql-test/main/temporal_literal.test diff --git a/mysql-test/r/temporal_scale_4283.result b/mysql-test/main/temporal_scale_4283.result similarity index 100% rename from mysql-test/r/temporal_scale_4283.result rename to 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 similarity index 100% rename from mysql-test/t/temporal_scale_4283.test rename to 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 similarity index 100% rename from mysql-test/r/thread_id_overflow.result rename to 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 similarity index 100% rename from mysql-test/t/thread_id_overflow.test rename to mysql-test/main/thread_id_overflow.test diff --git a/mysql-test/r/timeout.result b/mysql-test/main/timeout.result similarity index 100% rename from mysql-test/r/timeout.result rename to mysql-test/main/timeout.result diff --git a/mysql-test/t/timeout.test b/mysql-test/main/timeout.test similarity index 100% rename from mysql-test/t/timeout.test rename to mysql-test/main/timeout.test diff --git a/mysql-test/t/timezone-master.opt b/mysql-test/main/timezone-master.opt similarity index 100% rename from mysql-test/t/timezone-master.opt rename to mysql-test/main/timezone-master.opt diff --git a/mysql-test/r/timezone.result b/mysql-test/main/timezone.result similarity index 100% rename from mysql-test/r/timezone.result rename to mysql-test/main/timezone.result diff --git a/mysql-test/t/timezone.test b/mysql-test/main/timezone.test similarity index 97% rename from mysql-test/t/timezone.test rename to 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 similarity index 100% rename from mysql-test/r/timezone2.result rename to mysql-test/main/timezone2.result diff --git a/mysql-test/t/timezone2.test b/mysql-test/main/timezone2.test similarity index 100% rename from mysql-test/t/timezone2.test rename to mysql-test/main/timezone2.test diff --git a/mysql-test/t/timezone3-master.opt b/mysql-test/main/timezone3-master.opt similarity index 100% rename from mysql-test/t/timezone3-master.opt rename to mysql-test/main/timezone3-master.opt diff --git a/mysql-test/r/timezone3.result b/mysql-test/main/timezone3.result similarity index 100% rename from mysql-test/r/timezone3.result rename to mysql-test/main/timezone3.result diff --git a/mysql-test/t/timezone3.test b/mysql-test/main/timezone3.test similarity index 98% rename from mysql-test/t/timezone3.test rename to 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 similarity index 100% rename from mysql-test/t/timezone4-master.opt rename to mysql-test/main/timezone4-master.opt diff --git a/mysql-test/r/timezone4.result b/mysql-test/main/timezone4.result similarity index 100% rename from mysql-test/r/timezone4.result rename to mysql-test/main/timezone4.result diff --git a/mysql-test/t/timezone4.test b/mysql-test/main/timezone4.test similarity index 100% rename from mysql-test/t/timezone4.test rename to mysql-test/main/timezone4.test diff --git a/mysql-test/r/timezone_grant.result b/mysql-test/main/timezone_grant.result similarity index 100% rename from mysql-test/r/timezone_grant.result rename to mysql-test/main/timezone_grant.result diff --git a/mysql-test/t/timezone_grant.test b/mysql-test/main/timezone_grant.test similarity index 100% rename from mysql-test/t/timezone_grant.test rename to 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 similarity index 100% rename from mysql-test/r/tmp_table_count-7586.result rename to 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 similarity index 100% rename from mysql-test/t/tmp_table_count-7586.test rename to 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 similarity index 100% rename from mysql-test/t/trans_read_only-master.opt rename to 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 similarity index 100% rename from mysql-test/r/trans_read_only.result rename to 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 similarity index 100% rename from mysql-test/t/trans_read_only.test rename to mysql-test/main/trans_read_only.test diff --git a/mysql-test/r/transaction_timeout.result b/mysql-test/main/transaction_timeout.result similarity index 100% rename from mysql-test/r/transaction_timeout.result rename to mysql-test/main/transaction_timeout.result diff --git a/mysql-test/t/transaction_timeout.test b/mysql-test/main/transaction_timeout.test similarity index 100% rename from mysql-test/t/transaction_timeout.test rename to mysql-test/main/transaction_timeout.test diff --git a/mysql-test/r/trigger-compat.result b/mysql-test/main/trigger-compat.result similarity index 100% rename from mysql-test/r/trigger-compat.result rename to mysql-test/main/trigger-compat.result diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/main/trigger-compat.test similarity index 100% rename from mysql-test/t/trigger-compat.test rename to mysql-test/main/trigger-compat.test diff --git a/mysql-test/r/trigger-trans.result b/mysql-test/main/trigger-trans.result similarity index 100% rename from mysql-test/r/trigger-trans.result rename to mysql-test/main/trigger-trans.result diff --git a/mysql-test/t/trigger-trans.test b/mysql-test/main/trigger-trans.test similarity index 100% rename from mysql-test/t/trigger-trans.test rename to mysql-test/main/trigger-trans.test diff --git a/mysql-test/r/trigger.result b/mysql-test/main/trigger.result similarity index 100% rename from mysql-test/r/trigger.result rename to mysql-test/main/trigger.result diff --git a/mysql-test/t/trigger.test b/mysql-test/main/trigger.test similarity index 100% rename from mysql-test/t/trigger.test rename to 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 similarity index 100% rename from mysql-test/r/trigger_no_defaults-11698.result rename to 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 similarity index 100% rename from mysql-test/t/trigger_no_defaults-11698.test rename to mysql-test/main/trigger_no_defaults-11698.test diff --git a/mysql-test/r/trigger_notembedded.result b/mysql-test/main/trigger_notembedded.result similarity index 100% rename from mysql-test/r/trigger_notembedded.result rename to mysql-test/main/trigger_notembedded.result diff --git a/mysql-test/t/trigger_notembedded.test b/mysql-test/main/trigger_notembedded.test similarity index 100% rename from mysql-test/t/trigger_notembedded.test rename to mysql-test/main/trigger_notembedded.test diff --git a/mysql-test/r/trigger_null-8605.result b/mysql-test/main/trigger_null-8605.result similarity index 100% rename from mysql-test/r/trigger_null-8605.result rename to 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 similarity index 100% rename from mysql-test/t/trigger_null-8605.test rename to mysql-test/main/trigger_null-8605.test diff --git a/mysql-test/r/trigger_wl3253.result b/mysql-test/main/trigger_wl3253.result similarity index 100% rename from mysql-test/r/trigger_wl3253.result rename to mysql-test/main/trigger_wl3253.result diff --git a/mysql-test/t/trigger_wl3253.test b/mysql-test/main/trigger_wl3253.test similarity index 100% rename from mysql-test/t/trigger_wl3253.test rename to mysql-test/main/trigger_wl3253.test diff --git a/mysql-test/r/truncate-stale-6500.result b/mysql-test/main/truncate-stale-6500.result similarity index 100% rename from mysql-test/r/truncate-stale-6500.result rename to 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 similarity index 100% rename from mysql-test/t/truncate-stale-6500.test rename to mysql-test/main/truncate-stale-6500.test diff --git a/mysql-test/r/truncate.result b/mysql-test/main/truncate.result similarity index 100% rename from mysql-test/r/truncate.result rename to mysql-test/main/truncate.result diff --git a/mysql-test/t/truncate.test b/mysql-test/main/truncate.test similarity index 100% rename from mysql-test/t/truncate.test rename to mysql-test/main/truncate.test diff --git a/mysql-test/r/truncate_badse.result b/mysql-test/main/truncate_badse.result similarity index 100% rename from mysql-test/r/truncate_badse.result rename to mysql-test/main/truncate_badse.result diff --git a/mysql-test/t/truncate_badse.test b/mysql-test/main/truncate_badse.test similarity index 100% rename from mysql-test/t/truncate_badse.test rename to mysql-test/main/truncate_badse.test diff --git a/mysql-test/r/truncate_coverage.result b/mysql-test/main/truncate_coverage.result similarity index 100% rename from mysql-test/r/truncate_coverage.result rename to mysql-test/main/truncate_coverage.result diff --git a/mysql-test/t/truncate_coverage.test b/mysql-test/main/truncate_coverage.test similarity index 100% rename from mysql-test/t/truncate_coverage.test rename to mysql-test/main/truncate_coverage.test diff --git a/mysql-test/r/type_binary.result b/mysql-test/main/type_binary.result similarity index 100% rename from mysql-test/r/type_binary.result rename to mysql-test/main/type_binary.result diff --git a/mysql-test/t/type_binary.test b/mysql-test/main/type_binary.test similarity index 100% rename from mysql-test/t/type_binary.test rename to mysql-test/main/type_binary.test diff --git a/mysql-test/r/type_bit.result b/mysql-test/main/type_bit.result similarity index 100% rename from mysql-test/r/type_bit.result rename to mysql-test/main/type_bit.result diff --git a/mysql-test/t/type_bit.test b/mysql-test/main/type_bit.test similarity index 100% rename from mysql-test/t/type_bit.test rename to mysql-test/main/type_bit.test diff --git a/mysql-test/r/type_bit_innodb.result b/mysql-test/main/type_bit_innodb.result similarity index 100% rename from mysql-test/r/type_bit_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/type_bit_innodb.test rename to mysql-test/main/type_bit_innodb.test diff --git a/mysql-test/r/type_blob.result b/mysql-test/main/type_blob.result similarity index 100% rename from mysql-test/r/type_blob.result rename to mysql-test/main/type_blob.result diff --git a/mysql-test/t/type_blob.test b/mysql-test/main/type_blob.test similarity index 100% rename from mysql-test/t/type_blob.test rename to mysql-test/main/type_blob.test diff --git a/mysql-test/r/type_date.result b/mysql-test/main/type_date.result similarity index 100% rename from mysql-test/r/type_date.result rename to mysql-test/main/type_date.result diff --git a/mysql-test/t/type_date.test b/mysql-test/main/type_date.test similarity index 100% rename from mysql-test/t/type_date.test rename to mysql-test/main/type_date.test diff --git a/mysql-test/r/type_datetime.result b/mysql-test/main/type_datetime.result similarity index 100% rename from mysql-test/r/type_datetime.result rename to mysql-test/main/type_datetime.result diff --git a/mysql-test/t/type_datetime.test b/mysql-test/main/type_datetime.test similarity index 100% rename from mysql-test/t/type_datetime.test rename to mysql-test/main/type_datetime.test diff --git a/mysql-test/r/type_datetime_hires.result b/mysql-test/main/type_datetime_hires.result similarity index 100% rename from mysql-test/r/type_datetime_hires.result rename to 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 similarity index 100% rename from mysql-test/t/type_datetime_hires.test rename to mysql-test/main/type_datetime_hires.test diff --git a/mysql-test/r/type_decimal.result b/mysql-test/main/type_decimal.result similarity index 100% rename from mysql-test/r/type_decimal.result rename to mysql-test/main/type_decimal.result diff --git a/mysql-test/t/type_decimal.test b/mysql-test/main/type_decimal.test similarity index 100% rename from mysql-test/t/type_decimal.test rename to mysql-test/main/type_decimal.test diff --git a/mysql-test/r/type_enum.result b/mysql-test/main/type_enum.result similarity index 100% rename from mysql-test/r/type_enum.result rename to mysql-test/main/type_enum.result diff --git a/mysql-test/t/type_enum.test b/mysql-test/main/type_enum.test similarity index 100% rename from mysql-test/t/type_enum.test rename to mysql-test/main/type_enum.test diff --git a/mysql-test/r/type_float.result b/mysql-test/main/type_float.result similarity index 100% rename from mysql-test/r/type_float.result rename to mysql-test/main/type_float.result diff --git a/mysql-test/t/type_float.test b/mysql-test/main/type_float.test similarity index 100% rename from mysql-test/t/type_float.test rename to mysql-test/main/type_float.test diff --git a/mysql-test/r/type_int.result b/mysql-test/main/type_int.result similarity index 100% rename from mysql-test/r/type_int.result rename to mysql-test/main/type_int.result diff --git a/mysql-test/t/type_int.test b/mysql-test/main/type_int.test similarity index 100% rename from mysql-test/t/type_int.test rename to mysql-test/main/type_int.test diff --git a/mysql-test/r/type_json.result b/mysql-test/main/type_json.result similarity index 100% rename from mysql-test/r/type_json.result rename to mysql-test/main/type_json.result diff --git a/mysql-test/t/type_json.test b/mysql-test/main/type_json.test similarity index 100% rename from mysql-test/t/type_json.test rename to mysql-test/main/type_json.test diff --git a/mysql-test/r/type_nchar.result b/mysql-test/main/type_nchar.result similarity index 100% rename from mysql-test/r/type_nchar.result rename to mysql-test/main/type_nchar.result diff --git a/mysql-test/t/type_nchar.test b/mysql-test/main/type_nchar.test similarity index 100% rename from mysql-test/t/type_nchar.test rename to mysql-test/main/type_nchar.test diff --git a/mysql-test/r/type_newdecimal-big.result b/mysql-test/main/type_newdecimal-big.result similarity index 100% rename from mysql-test/r/type_newdecimal-big.result rename to 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 similarity index 100% rename from mysql-test/t/type_newdecimal-big.test rename to mysql-test/main/type_newdecimal-big.test diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/main/type_newdecimal.result similarity index 100% rename from mysql-test/r/type_newdecimal.result rename to mysql-test/main/type_newdecimal.result diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/main/type_newdecimal.test similarity index 100% rename from mysql-test/t/type_newdecimal.test rename to mysql-test/main/type_newdecimal.test diff --git a/mysql-test/r/type_num.result b/mysql-test/main/type_num.result similarity index 100% rename from mysql-test/r/type_num.result rename to mysql-test/main/type_num.result diff --git a/mysql-test/t/type_num.test b/mysql-test/main/type_num.test similarity index 100% rename from mysql-test/t/type_num.test rename to mysql-test/main/type_num.test diff --git a/mysql-test/r/type_num_innodb.result b/mysql-test/main/type_num_innodb.result similarity index 100% rename from mysql-test/r/type_num_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/type_num_innodb.test rename to mysql-test/main/type_num_innodb.test diff --git a/mysql-test/r/type_ranges.result b/mysql-test/main/type_ranges.result similarity index 100% rename from mysql-test/r/type_ranges.result rename to mysql-test/main/type_ranges.result diff --git a/mysql-test/t/type_ranges.test b/mysql-test/main/type_ranges.test similarity index 100% rename from mysql-test/t/type_ranges.test rename to mysql-test/main/type_ranges.test diff --git a/mysql-test/r/type_set.result b/mysql-test/main/type_set.result similarity index 100% rename from mysql-test/r/type_set.result rename to mysql-test/main/type_set.result diff --git a/mysql-test/t/type_set.test b/mysql-test/main/type_set.test similarity index 100% rename from mysql-test/t/type_set.test rename to mysql-test/main/type_set.test diff --git a/mysql-test/r/type_temporal_innodb.result b/mysql-test/main/type_temporal_innodb.result similarity index 100% rename from mysql-test/r/type_temporal_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/type_temporal_innodb.test rename to 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 similarity index 100% rename from mysql-test/r/type_temporal_mysql56.result rename to 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 similarity index 100% rename from mysql-test/t/type_temporal_mysql56.test rename to mysql-test/main/type_temporal_mysql56.test diff --git a/mysql-test/r/type_time.result b/mysql-test/main/type_time.result similarity index 100% rename from mysql-test/r/type_time.result rename to mysql-test/main/type_time.result diff --git a/mysql-test/t/type_time.test b/mysql-test/main/type_time.test similarity index 100% rename from mysql-test/t/type_time.test rename to mysql-test/main/type_time.test diff --git a/mysql-test/r/type_time_6065.result b/mysql-test/main/type_time_6065.result similarity index 100% rename from mysql-test/r/type_time_6065.result rename to 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 similarity index 100% rename from mysql-test/t/type_time_6065.test rename to 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 similarity index 100% rename from mysql-test/r/type_time_hires.result rename to 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 similarity index 100% rename from mysql-test/t/type_time_hires.test rename to mysql-test/main/type_time_hires.test diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/main/type_timestamp.result similarity index 100% rename from mysql-test/r/type_timestamp.result rename to mysql-test/main/type_timestamp.result diff --git a/mysql-test/t/type_timestamp.test b/mysql-test/main/type_timestamp.test similarity index 100% rename from mysql-test/t/type_timestamp.test rename to mysql-test/main/type_timestamp.test diff --git a/mysql-test/r/type_timestamp_hires.result b/mysql-test/main/type_timestamp_hires.result similarity index 100% rename from mysql-test/r/type_timestamp_hires.result rename to 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 similarity index 100% rename from mysql-test/t/type_timestamp_hires.test rename to mysql-test/main/type_timestamp_hires.test diff --git a/mysql-test/r/type_uint.result b/mysql-test/main/type_uint.result similarity index 100% rename from mysql-test/r/type_uint.result rename to mysql-test/main/type_uint.result diff --git a/mysql-test/t/type_uint.test b/mysql-test/main/type_uint.test similarity index 100% rename from mysql-test/t/type_uint.test rename to mysql-test/main/type_uint.test diff --git a/mysql-test/r/type_varchar.result b/mysql-test/main/type_varchar.result similarity index 100% rename from mysql-test/r/type_varchar.result rename to mysql-test/main/type_varchar.result diff --git a/mysql-test/t/type_varchar.test b/mysql-test/main/type_varchar.test similarity index 100% rename from mysql-test/t/type_varchar.test rename to mysql-test/main/type_varchar.test diff --git a/mysql-test/r/type_year.result b/mysql-test/main/type_year.result similarity index 100% rename from mysql-test/r/type_year.result rename to mysql-test/main/type_year.result diff --git a/mysql-test/t/type_year.test b/mysql-test/main/type_year.test similarity index 100% rename from mysql-test/t/type_year.test rename to mysql-test/main/type_year.test diff --git a/mysql-test/r/udf.result b/mysql-test/main/udf.result similarity index 100% rename from mysql-test/r/udf.result rename to mysql-test/main/udf.result diff --git a/mysql-test/t/udf.test b/mysql-test/main/udf.test similarity index 100% rename from mysql-test/t/udf.test rename to mysql-test/main/udf.test diff --git a/mysql-test/r/udf_debug_sync.result b/mysql-test/main/udf_debug_sync.result similarity index 100% rename from mysql-test/r/udf_debug_sync.result rename to 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 similarity index 100% rename from mysql-test/t/udf_debug_sync.test rename to mysql-test/main/udf_debug_sync.test diff --git a/mysql-test/r/udf_notembedded.result b/mysql-test/main/udf_notembedded.result similarity index 100% rename from mysql-test/r/udf_notembedded.result rename to mysql-test/main/udf_notembedded.result diff --git a/mysql-test/t/udf_notembedded.test b/mysql-test/main/udf_notembedded.test similarity index 100% rename from mysql-test/t/udf_notembedded.test rename to mysql-test/main/udf_notembedded.test diff --git a/mysql-test/r/udf_query_cache.result b/mysql-test/main/udf_query_cache.result similarity index 100% rename from mysql-test/r/udf_query_cache.result rename to 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 similarity index 100% rename from mysql-test/t/udf_query_cache.test rename to 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 similarity index 100% rename from mysql-test/t/udf_skip_grants-master.opt rename to 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 similarity index 100% rename from mysql-test/r/udf_skip_grants.result rename to 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 similarity index 100% rename from mysql-test/t/udf_skip_grants.test rename to mysql-test/main/udf_skip_grants.test diff --git a/mysql-test/t/union-master.opt b/mysql-test/main/union-master.opt similarity index 100% rename from mysql-test/t/union-master.opt rename to mysql-test/main/union-master.opt diff --git a/mysql-test/r/union.result b/mysql-test/main/union.result similarity index 100% rename from mysql-test/r/union.result rename to mysql-test/main/union.result diff --git a/mysql-test/t/union.test b/mysql-test/main/union.test similarity index 100% rename from mysql-test/t/union.test rename to mysql-test/main/union.test diff --git a/mysql-test/r/union_crash-714.result b/mysql-test/main/union_crash-714.result similarity index 100% rename from mysql-test/r/union_crash-714.result rename to 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 similarity index 100% rename from mysql-test/t/union_crash-714.test rename to 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 similarity index 100% rename from mysql-test/r/uniques_crash-7912.result rename to 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 similarity index 100% rename from mysql-test/t/uniques_crash-7912.test rename to 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 similarity index 100% rename from mysql-test/t/unsafe_binlog_innodb-master.opt rename to 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 similarity index 100% rename from mysql-test/r/unsafe_binlog_innodb.result rename to 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 similarity index 100% rename from mysql-test/t/unsafe_binlog_innodb.test rename to mysql-test/main/unsafe_binlog_innodb.test diff --git a/mysql-test/r/update.result b/mysql-test/main/update.result similarity index 100% rename from mysql-test/r/update.result rename to mysql-test/main/update.result diff --git a/mysql-test/t/update.test b/mysql-test/main/update.test similarity index 100% rename from mysql-test/t/update.test rename to mysql-test/main/update.test diff --git a/mysql-test/r/update_ignore_216.result b/mysql-test/main/update_ignore_216.result similarity index 100% rename from mysql-test/r/update_ignore_216.result rename to 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 similarity index 100% rename from mysql-test/t/update_ignore_216.test rename to mysql-test/main/update_ignore_216.test diff --git a/mysql-test/r/update_innodb.result b/mysql-test/main/update_innodb.result similarity index 100% rename from mysql-test/r/update_innodb.result rename to mysql-test/main/update_innodb.result diff --git a/mysql-test/t/update_innodb.test b/mysql-test/main/update_innodb.test similarity index 100% rename from mysql-test/t/update_innodb.test rename to mysql-test/main/update_innodb.test diff --git a/mysql-test/r/update_use_source.result b/mysql-test/main/update_use_source.result similarity index 100% rename from mysql-test/r/update_use_source.result rename to 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 similarity index 100% rename from mysql-test/t/update_use_source.test rename to mysql-test/main/update_use_source.test diff --git a/mysql-test/r/upgrade.result b/mysql-test/main/upgrade.result similarity index 100% rename from mysql-test/r/upgrade.result rename to mysql-test/main/upgrade.result diff --git a/mysql-test/t/upgrade.test b/mysql-test/main/upgrade.test similarity index 100% rename from mysql-test/t/upgrade.test rename to mysql-test/main/upgrade.test diff --git a/mysql-test/t/user_limits-master.opt b/mysql-test/main/user_limits-master.opt similarity index 100% rename from mysql-test/t/user_limits-master.opt rename to mysql-test/main/user_limits-master.opt diff --git a/mysql-test/r/user_limits.result b/mysql-test/main/user_limits.result similarity index 100% rename from mysql-test/r/user_limits.result rename to mysql-test/main/user_limits.result diff --git a/mysql-test/t/user_limits.test b/mysql-test/main/user_limits.test similarity index 100% rename from mysql-test/t/user_limits.test rename to mysql-test/main/user_limits.test diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/main/user_var-binlog.result similarity index 100% rename from mysql-test/r/user_var-binlog.result rename to 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 similarity index 100% rename from mysql-test/t/user_var-binlog.test rename to mysql-test/main/user_var-binlog.test diff --git a/mysql-test/r/user_var.result b/mysql-test/main/user_var.result similarity index 100% rename from mysql-test/r/user_var.result rename to mysql-test/main/user_var.result diff --git a/mysql-test/t/user_var.test b/mysql-test/main/user_var.test similarity index 100% rename from mysql-test/t/user_var.test rename to mysql-test/main/user_var.test diff --git a/mysql-test/r/userstat-badlogin-4824.result b/mysql-test/main/userstat-badlogin-4824.result similarity index 100% rename from mysql-test/r/userstat-badlogin-4824.result rename to 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 similarity index 100% rename from mysql-test/t/userstat-badlogin-4824.test rename to mysql-test/main/userstat-badlogin-4824.test diff --git a/mysql-test/r/userstat.result b/mysql-test/main/userstat.result similarity index 100% rename from mysql-test/r/userstat.result rename to mysql-test/main/userstat.result diff --git a/mysql-test/t/userstat.test b/mysql-test/main/userstat.test similarity index 100% rename from mysql-test/t/userstat.test rename to mysql-test/main/userstat.test diff --git a/mysql-test/r/varbinary.result b/mysql-test/main/varbinary.result similarity index 100% rename from mysql-test/r/varbinary.result rename to mysql-test/main/varbinary.result diff --git a/mysql-test/t/varbinary.test b/mysql-test/main/varbinary.test similarity index 100% rename from mysql-test/t/varbinary.test rename to mysql-test/main/varbinary.test diff --git a/mysql-test/t/variables-master.opt b/mysql-test/main/variables-master.opt similarity index 100% rename from mysql-test/t/variables-master.opt rename to mysql-test/main/variables-master.opt diff --git a/mysql-test/t/variables-notembedded-master.opt b/mysql-test/main/variables-notembedded-master.opt similarity index 100% rename from mysql-test/t/variables-notembedded-master.opt rename to mysql-test/main/variables-notembedded-master.opt diff --git a/mysql-test/r/variables-notembedded.result b/mysql-test/main/variables-notembedded.result similarity index 100% rename from mysql-test/r/variables-notembedded.result rename to mysql-test/main/variables-notembedded.result diff --git a/mysql-test/t/variables-notembedded.test b/mysql-test/main/variables-notembedded.test similarity index 100% rename from mysql-test/t/variables-notembedded.test rename to mysql-test/main/variables-notembedded.test diff --git a/mysql-test/r/variables.result b/mysql-test/main/variables.result similarity index 100% rename from mysql-test/r/variables.result rename to mysql-test/main/variables.result diff --git a/mysql-test/t/variables.test b/mysql-test/main/variables.test similarity index 100% rename from mysql-test/t/variables.test rename to mysql-test/main/variables.test diff --git a/mysql-test/r/variables_community.result b/mysql-test/main/variables_community.result similarity index 100% rename from mysql-test/r/variables_community.result rename to mysql-test/main/variables_community.result diff --git a/mysql-test/t/variables_community.test b/mysql-test/main/variables_community.test similarity index 100% rename from mysql-test/t/variables_community.test rename to mysql-test/main/variables_community.test diff --git a/mysql-test/r/view.result b/mysql-test/main/view.result similarity index 100% rename from mysql-test/r/view.result rename to mysql-test/main/view.result diff --git a/mysql-test/t/view.test b/mysql-test/main/view.test similarity index 100% rename from mysql-test/t/view.test rename to mysql-test/main/view.test diff --git a/mysql-test/r/view_alias.result b/mysql-test/main/view_alias.result similarity index 100% rename from mysql-test/r/view_alias.result rename to mysql-test/main/view_alias.result diff --git a/mysql-test/t/view_alias.test b/mysql-test/main/view_alias.test similarity index 100% rename from mysql-test/t/view_alias.test rename to mysql-test/main/view_alias.test diff --git a/mysql-test/r/view_debug.result b/mysql-test/main/view_debug.result similarity index 100% rename from mysql-test/r/view_debug.result rename to mysql-test/main/view_debug.result diff --git a/mysql-test/t/view_debug.test b/mysql-test/main/view_debug.test similarity index 100% rename from mysql-test/t/view_debug.test rename to mysql-test/main/view_debug.test diff --git a/mysql-test/r/view_grant.result b/mysql-test/main/view_grant.result similarity index 100% rename from mysql-test/r/view_grant.result rename to mysql-test/main/view_grant.result diff --git a/mysql-test/t/view_grant.test b/mysql-test/main/view_grant.test similarity index 100% rename from mysql-test/t/view_grant.test rename to mysql-test/main/view_grant.test diff --git a/mysql-test/r/wait_timeout.result b/mysql-test/main/wait_timeout.result similarity index 100% rename from mysql-test/r/wait_timeout.result rename to mysql-test/main/wait_timeout.result diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/main/wait_timeout.test similarity index 100% rename from mysql-test/t/wait_timeout.test rename to mysql-test/main/wait_timeout.test diff --git a/mysql-test/t/warnings-master.opt b/mysql-test/main/warnings-master.opt similarity index 100% rename from mysql-test/t/warnings-master.opt rename to mysql-test/main/warnings-master.opt diff --git a/mysql-test/r/warnings.result b/mysql-test/main/warnings.result similarity index 100% rename from mysql-test/r/warnings.result rename to mysql-test/main/warnings.result diff --git a/mysql-test/t/warnings.test b/mysql-test/main/warnings.test similarity index 100% rename from mysql-test/t/warnings.test rename to mysql-test/main/warnings.test diff --git a/mysql-test/r/warnings_debug.result b/mysql-test/main/warnings_debug.result similarity index 100% rename from mysql-test/r/warnings_debug.result rename to mysql-test/main/warnings_debug.result diff --git a/mysql-test/t/warnings_debug.test b/mysql-test/main/warnings_debug.test similarity index 100% rename from mysql-test/t/warnings_debug.test rename to mysql-test/main/warnings_debug.test diff --git a/mysql-test/r/warnings_engine_disabled.result b/mysql-test/main/warnings_engine_disabled.result similarity index 100% rename from mysql-test/r/warnings_engine_disabled.result rename to 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 similarity index 100% rename from mysql-test/t/warnings_engine_disabled.test rename to mysql-test/main/warnings_engine_disabled.test diff --git a/mysql-test/r/win.result b/mysql-test/main/win.result similarity index 100% rename from mysql-test/r/win.result rename to mysql-test/main/win.result diff --git a/mysql-test/t/win.test b/mysql-test/main/win.test similarity index 100% rename from mysql-test/t/win.test rename to 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 similarity index 100% rename from mysql-test/r/win_as_arg_to_aggregate_func.result rename to 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 similarity index 100% rename from mysql-test/t/win_as_arg_to_aggregate_func.test rename to 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 similarity index 100% rename from mysql-test/r/win_avg.result rename to mysql-test/main/win_avg.result diff --git a/mysql-test/t/win_avg.test b/mysql-test/main/win_avg.test similarity index 100% rename from mysql-test/t/win_avg.test rename to 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 similarity index 100% rename from mysql-test/r/win_big-mdev-10092.result rename to 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 similarity index 100% rename from mysql-test/t/win_big-mdev-10092.test rename to 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 similarity index 100% rename from mysql-test/r/win_big-mdev-11697.result rename to 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 similarity index 100% rename from mysql-test/t/win_big-mdev-11697.test rename to mysql-test/main/win_big-mdev-11697.test diff --git a/mysql-test/r/win_big.result b/mysql-test/main/win_big.result similarity index 100% rename from mysql-test/r/win_big.result rename to mysql-test/main/win_big.result diff --git a/mysql-test/t/win_big.test b/mysql-test/main/win_big.test similarity index 100% rename from mysql-test/t/win_big.test rename to mysql-test/main/win_big.test diff --git a/mysql-test/r/win_bit.result b/mysql-test/main/win_bit.result similarity index 100% rename from mysql-test/r/win_bit.result rename to mysql-test/main/win_bit.result diff --git a/mysql-test/t/win_bit.test b/mysql-test/main/win_bit.test similarity index 100% rename from mysql-test/t/win_bit.test rename to mysql-test/main/win_bit.test diff --git a/mysql-test/r/win_empty_over.result b/mysql-test/main/win_empty_over.result similarity index 100% rename from mysql-test/r/win_empty_over.result rename to 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 similarity index 100% rename from mysql-test/t/win_empty_over.test rename to 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 similarity index 100% rename from mysql-test/r/win_first_last_value.result rename to 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 similarity index 100% rename from mysql-test/t/win_first_last_value.test rename to 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 similarity index 100% rename from mysql-test/r/win_i_s.result rename to 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 similarity index 100% rename from mysql-test/t/win_i_s.test rename to 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 similarity index 100% rename from mysql-test/r/win_insert_select.result rename to 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 similarity index 100% rename from mysql-test/t/win_insert_select.test rename to 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 similarity index 100% rename from mysql-test/r/win_lead_lag.result rename to 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 similarity index 100% rename from mysql-test/t/win_lead_lag.test rename to 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 similarity index 100% rename from mysql-test/r/win_min_max.result rename to 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 similarity index 100% rename from mysql-test/t/win_min_max.test rename to 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 similarity index 100% rename from mysql-test/r/win_nth_value.result rename to 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 similarity index 100% rename from mysql-test/t/win_nth_value.test rename to mysql-test/main/win_nth_value.test diff --git a/mysql-test/r/win_ntile.result b/mysql-test/main/win_ntile.result similarity index 100% rename from mysql-test/r/win_ntile.result rename to mysql-test/main/win_ntile.result diff --git a/mysql-test/t/win_ntile.test b/mysql-test/main/win_ntile.test similarity index 100% rename from mysql-test/t/win_ntile.test rename to mysql-test/main/win_ntile.test diff --git a/mysql-test/r/win_orderby.result b/mysql-test/main/win_orderby.result similarity index 100% rename from mysql-test/r/win_orderby.result rename to mysql-test/main/win_orderby.result diff --git a/mysql-test/t/win_orderby.test b/mysql-test/main/win_orderby.test similarity index 100% rename from mysql-test/t/win_orderby.test rename to mysql-test/main/win_orderby.test diff --git a/mysql-test/r/win_percent_cume.result b/mysql-test/main/win_percent_cume.result similarity index 100% rename from mysql-test/r/win_percent_cume.result rename to 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 similarity index 100% rename from mysql-test/t/win_percent_cume.test rename to mysql-test/main/win_percent_cume.test diff --git a/mysql-test/r/win_percentile.result b/mysql-test/main/win_percentile.result similarity index 100% rename from mysql-test/r/win_percentile.result rename to mysql-test/main/win_percentile.result diff --git a/mysql-test/t/win_percentile.test b/mysql-test/main/win_percentile.test similarity index 100% rename from mysql-test/t/win_percentile.test rename to mysql-test/main/win_percentile.test diff --git a/mysql-test/r/win_rank.result b/mysql-test/main/win_rank.result similarity index 100% rename from mysql-test/r/win_rank.result rename to mysql-test/main/win_rank.result diff --git a/mysql-test/t/win_rank.test b/mysql-test/main/win_rank.test similarity index 100% rename from mysql-test/t/win_rank.test rename to mysql-test/main/win_rank.test diff --git a/mysql-test/r/win_std.result b/mysql-test/main/win_std.result similarity index 100% rename from mysql-test/r/win_std.result rename to mysql-test/main/win_std.result diff --git a/mysql-test/t/win_std.test b/mysql-test/main/win_std.test similarity index 100% rename from mysql-test/t/win_std.test rename to mysql-test/main/win_std.test diff --git a/mysql-test/r/win_sum.result b/mysql-test/main/win_sum.result similarity index 100% rename from mysql-test/r/win_sum.result rename to mysql-test/main/win_sum.result diff --git a/mysql-test/t/win_sum.test b/mysql-test/main/win_sum.test similarity index 100% rename from mysql-test/t/win_sum.test rename to mysql-test/main/win_sum.test diff --git a/mysql-test/r/windows.result b/mysql-test/main/windows.result similarity index 100% rename from mysql-test/r/windows.result rename to mysql-test/main/windows.result diff --git a/mysql-test/t/windows.test b/mysql-test/main/windows.test similarity index 100% rename from mysql-test/t/windows.test rename to mysql-test/main/windows.test diff --git a/mysql-test/t/wl4435_generated.inc b/mysql-test/main/wl4435_generated.inc similarity index 100% rename from mysql-test/t/wl4435_generated.inc rename to mysql-test/main/wl4435_generated.inc diff --git a/mysql-test/r/xa.result b/mysql-test/main/xa.result similarity index 100% rename from mysql-test/r/xa.result rename to mysql-test/main/xa.result diff --git a/mysql-test/t/xa.test b/mysql-test/main/xa.test similarity index 100% rename from mysql-test/t/xa.test rename to mysql-test/main/xa.test diff --git a/mysql-test/r/xa_binlog.result b/mysql-test/main/xa_binlog.result similarity index 100% rename from mysql-test/r/xa_binlog.result rename to mysql-test/main/xa_binlog.result diff --git a/mysql-test/t/xa_binlog.test b/mysql-test/main/xa_binlog.test similarity index 100% rename from mysql-test/t/xa_binlog.test rename to mysql-test/main/xa_binlog.test diff --git a/mysql-test/r/xa_sync.result b/mysql-test/main/xa_sync.result similarity index 100% rename from mysql-test/r/xa_sync.result rename to mysql-test/main/xa_sync.result diff --git a/mysql-test/t/xa_sync.test b/mysql-test/main/xa_sync.test similarity index 100% rename from mysql-test/t/xa_sync.test rename to mysql-test/main/xa_sync.test diff --git a/mysql-test/r/xml.result b/mysql-test/main/xml.result similarity index 100% rename from mysql-test/r/xml.result rename to mysql-test/main/xml.result diff --git a/mysql-test/t/xml.test b/mysql-test/main/xml.test similarity index 100% rename from mysql-test/t/xml.test rename to mysql-test/main/xml.test diff --git a/mysql-test/r/xtradb_mrr.result b/mysql-test/main/xtradb_mrr.result similarity index 100% rename from mysql-test/r/xtradb_mrr.result rename to mysql-test/main/xtradb_mrr.result diff --git a/mysql-test/t/xtradb_mrr.test b/mysql-test/main/xtradb_mrr.test similarity index 100% rename from mysql-test/t/xtradb_mrr.test rename to 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"