diff options
Diffstat (limited to 'mysql-test/include')
56 files changed, 86 insertions, 27 deletions
diff --git a/mysql-test/include/big_test.inc b/mysql-test/include/big_test.inc index 6b149540c96..6bc6776d3bb 100644 --- a/mysql-test/include/big_test.inc +++ b/mysql-test/include/big_test.inc @@ -1,4 +1,4 @@ ---require r/big_test.require +--require include/big_test.require disable_query_log; eval select $BIG_TEST as using_big_test; enable_query_log; diff --git a/mysql-test/include/big_test.require b/mysql-test/include/big_test.require new file mode 100644 index 00000000000..001b903496b --- /dev/null +++ b/mysql-test/include/big_test.require @@ -0,0 +1,2 @@ +using_big_test +1 diff --git a/mysql-test/include/case_insensitive_file_system.require b/mysql-test/include/case_insensitive_file_system.require new file mode 100644 index 00000000000..062ac610ddd --- /dev/null +++ b/mysql-test/include/case_insensitive_file_system.require @@ -0,0 +1,2 @@ +Variable_name Value +lower_case_file_system ON diff --git a/mysql-test/include/case_insensitive_fs.require b/mysql-test/include/case_insensitive_fs.require new file mode 100644 index 00000000000..062ac610ddd --- /dev/null +++ b/mysql-test/include/case_insensitive_fs.require @@ -0,0 +1,2 @@ +Variable_name Value +lower_case_file_system ON diff --git a/mysql-test/include/case_sensitive_file_system.require b/mysql-test/include/case_sensitive_file_system.require new file mode 100644 index 00000000000..d0bdc6bf4ce --- /dev/null +++ b/mysql-test/include/case_sensitive_file_system.require @@ -0,0 +1,2 @@ +Variable_name Value +lower_case_file_system OFF 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/include/check_var_limit.require b/mysql-test/include/check_var_limit.require new file mode 100644 index 00000000000..01a59782180 --- /dev/null +++ b/mysql-test/include/check_var_limit.require @@ -0,0 +1,2 @@ +limit +1 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/include/have_compress.require b/mysql-test/include/have_compress.require new file mode 100644 index 00000000000..8bda2190fbe --- /dev/null +++ b/mysql-test/include/have_compress.require @@ -0,0 +1,2 @@ +Variable_name Value +have_compress YES 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/include/have_geometry.require b/mysql-test/include/have_geometry.require new file mode 100644 index 00000000000..ba515a4bbb6 --- /dev/null +++ b/mysql-test/include/have_geometry.require @@ -0,0 +1,2 @@ +Variable_name Value +have_geometry YES 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/include/have_local_infile.require b/mysql-test/include/have_local_infile.require new file mode 100644 index 00000000000..124540f7b77 --- /dev/null +++ b/mysql-test/include/have_local_infile.require @@ -0,0 +1,2 @@ +Variable_name Value +local_infile ON 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/include/have_log_bin.require b/mysql-test/include/have_log_bin.require new file mode 100644 index 00000000000..d4fd77e4f8d --- /dev/null +++ b/mysql-test/include/have_log_bin.require @@ -0,0 +1,2 @@ +Variable_name Value +log_bin ON 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/include/have_met_timezone.require b/mysql-test/include/have_met_timezone.require new file mode 100644 index 00000000000..b3fde075ebd --- /dev/null +++ b/mysql-test/include/have_met_timezone.require @@ -0,0 +1,2 @@ +FROM_UNIXTIME(24*3600) +1970-01-02 01:00:00 diff --git a/mysql-test/include/have_moscow_leap_timezone.require b/mysql-test/include/have_moscow_leap_timezone.require new file mode 100644 index 00000000000..f27452d7770 --- /dev/null +++ b/mysql-test/include/have_moscow_leap_timezone.require @@ -0,0 +1,2 @@ +from_unixtime(1072904422) +2004-01-01 00:00:00 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/include/have_outfile.require b/mysql-test/include/have_outfile.require new file mode 100644 index 00000000000..71137a69a91 --- /dev/null +++ b/mysql-test/include/have_outfile.require @@ -0,0 +1,3 @@ +load_file(concat(@tmpdir,'/outfile.test')) +Outfile OK + diff --git a/mysql-test/include/have_perror.require b/mysql-test/include/have_perror.require new file mode 100644 index 00000000000..260687c87f0 --- /dev/null +++ b/mysql-test/include/have_perror.require @@ -0,0 +1,2 @@ +have_perror +1 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/include/have_pool_of_threads.require b/mysql-test/include/have_pool_of_threads.require new file mode 100644 index 00000000000..04e46a71903 --- /dev/null +++ b/mysql-test/include/have_pool_of_threads.require @@ -0,0 +1,2 @@ +Variable_name Value +thread_handling pool-of-threads 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/include/have_profiling.require b/mysql-test/include/have_profiling.require new file mode 100644 index 00000000000..54caeba1dae --- /dev/null +++ b/mysql-test/include/have_profiling.require @@ -0,0 +1,2 @@ +Variable_name Value +have_profiling YES 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/include/have_query_cache.require b/mysql-test/include/have_query_cache.require new file mode 100644 index 00000000000..312d837fed3 --- /dev/null +++ b/mysql-test/include/have_query_cache.require @@ -0,0 +1,2 @@ +Variable_name Value +have_query_cache YES 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/include/have_symlink.require b/mysql-test/include/have_symlink.require new file mode 100644 index 00000000000..55ad9437034 --- /dev/null +++ b/mysql-test/include/have_symlink.require @@ -0,0 +1,2 @@ +Variable_name Value +have_symlink YES 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/include/have_utf16.require b/mysql-test/include/have_utf16.require new file mode 100644 index 00000000000..a1b5469cad7 --- /dev/null +++ b/mysql-test/include/have_utf16.require @@ -0,0 +1,2 @@ +Collation Charset Id Default Compiled Sortlen +utf16_general_ci utf16 54 Yes Yes 1 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/include/have_utf32.require b/mysql-test/include/have_utf32.require new file mode 100644 index 00000000000..710ddb8090c --- /dev/null +++ b/mysql-test/include/have_utf32.require @@ -0,0 +1,2 @@ +Collation Charset Id Default Compiled Sortlen +utf32_general_ci utf32 60 Yes Yes 1 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/include/have_utf8mb4.require b/mysql-test/include/have_utf8mb4.require new file mode 100644 index 00000000000..1669b332d0d --- /dev/null +++ b/mysql-test/include/have_utf8mb4.require @@ -0,0 +1,2 @@ +Collation Charset Id Default Compiled Sortlen +utf8mb4_general_ci utf8mb4 45 Yes Yes 1 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/include/have_working_dns.require b/mysql-test/include/have_working_dns.require new file mode 100644 index 00000000000..67b5a22ce19 --- /dev/null +++ b/mysql-test/include/have_working_dns.require @@ -0,0 +1,2 @@ +have_working_dns +1 diff --git a/mysql-test/include/lowercase0.require b/mysql-test/include/lowercase0.require new file mode 100644 index 00000000000..5550a2e93b8 --- /dev/null +++ b/mysql-test/include/lowercase0.require @@ -0,0 +1,2 @@ +Variable_name Value +lower_case_table_names 0 diff --git a/mysql-test/include/lowercase1.require b/mysql-test/include/lowercase1.require new file mode 100644 index 00000000000..0341f838f7b --- /dev/null +++ b/mysql-test/include/lowercase1.require @@ -0,0 +1,2 @@ +Variable_name Value +lower_case_table_names 1 diff --git a/mysql-test/include/lowercase2.require b/mysql-test/include/lowercase2.require new file mode 100644 index 00000000000..522eac63e81 --- /dev/null +++ b/mysql-test/include/lowercase2.require @@ -0,0 +1,2 @@ +Variable_name Value +lower_case_table_names 2 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/include/not_staging.require b/mysql-test/include/not_staging.require new file mode 100644 index 00000000000..3073f02c045 --- /dev/null +++ b/mysql-test/include/not_staging.require @@ -0,0 +1,2 @@ +using_staging_run +0 diff --git a/mysql-test/include/not_true.require b/mysql-test/include/not_true.require new file mode 100644 index 00000000000..0032832f3d1 --- /dev/null +++ b/mysql-test/include/not_true.require @@ -0,0 +1,2 @@ +TRUE +NULL 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/include/not_valgrind.require b/mysql-test/include/not_valgrind.require new file mode 100644 index 00000000000..5d779c6bfcb --- /dev/null +++ b/mysql-test/include/not_valgrind.require @@ -0,0 +1,2 @@ +using_valgrind +0 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/include/one_thread_per_connection.require b/mysql-test/include/one_thread_per_connection.require new file mode 100644 index 00000000000..b2efbca6441 --- /dev/null +++ b/mysql-test/include/one_thread_per_connection.require @@ -0,0 +1,2 @@ +@@thread_handling +one-thread-per-connection diff --git a/mysql-test/include/true.require b/mysql-test/include/true.require new file mode 100644 index 00000000000..09aae1ed1d0 --- /dev/null +++ b/mysql-test/include/true.require @@ -0,0 +1,2 @@ +TRUE +1 |