Took the system variable tests out of the main test suite and put them into "sys_vars".

a6c89eb2 · Horst Hunger · 30d8a8f9 · a6c89eb2 · a6c89eb2 · a6c89eb2
Commit a6c89eb2 authored Dec 12, 2008 by Horst Hunger
515 changed files
--- a/mysql-test/include/charset_basic.inc
+++ b/mysql-test/include/charset_basic.inc
--- a/mysql-test/include/collation_basic.inc
+++ b/mysql-test/include/collation_basic.inc
--- a/mysql-test/r/auto_commit_basic.result
+++ b/mysql-test/r/auto_commit_basic.result
--- a/mysql-test/r/auto_increment_increment_basic.result
+++ b/mysql-test/r/auto_increment_increment_basic.result
--- a/mysql-test/r/auto_increment_increment_func.result
+++ b/mysql-test/r/auto_increment_increment_func.result
--- a/mysql-test/r/auto_increment_offset_basic.result
+++ b/mysql-test/r/auto_increment_offset_basic.result
--- a/mysql-test/r/auto_increment_offset_func.result
+++ b/mysql-test/r/auto_increment_offset_func.result
--- a/mysql-test/r/autocommit_func.result
+++ b/mysql-test/r/autocommit_func.result
--- a/mysql-test/r/automatic_sp_privileges_basic.result
+++ b/mysql-test/r/automatic_sp_privileges_basic.result
--- a/mysql-test/r/automatic_sp_privileges_func.result
+++ b/mysql-test/r/automatic_sp_privileges_func.result
--- a/mysql-test/r/basedir_basic.result
+++ b/mysql-test/r/basedir_basic.result
--- a/mysql-test/r/big_tables_basic.result
+++ b/mysql-test/r/big_tables_basic.result
--- a/mysql-test/r/binlog_format_basic.result
+++ b/mysql-test/r/binlog_format_basic.result
--- a/mysql-test/r/character_set_client_basic.result
+++ b/mysql-test/r/character_set_client_basic.result
--- a/mysql-test/r/character_set_client_func.result
+++ b/mysql-test/r/character_set_client_func.result
--- a/mysql-test/r/character_set_connection_basic.result
+++ b/mysql-test/r/character_set_connection_basic.result
--- a/mysql-test/r/character_set_connection_func.result
+++ b/mysql-test/r/character_set_connection_func.result
--- a/mysql-test/r/character_set_database_basic.result
+++ b/mysql-test/r/character_set_database_basic.result
--- a/mysql-test/r/character_set_database_func.result
+++ b/mysql-test/r/character_set_database_func.result
--- a/mysql-test/r/character_set_filesystem_basic.result
+++ b/mysql-test/r/character_set_filesystem_basic.result
--- a/mysql-test/r/character_set_results_basic.result
+++ b/mysql-test/r/character_set_results_basic.result
--- a/mysql-test/r/character_set_results_func.result
+++ b/mysql-test/r/character_set_results_func.result
--- a/mysql-test/r/character_set_server_basic.result
+++ b/mysql-test/r/character_set_server_basic.result
--- a/mysql-test/r/character_set_server_func.result
+++ b/mysql-test/r/character_set_server_func.result
--- a/mysql-test/r/character_set_system_basic.result
+++ b/mysql-test/r/character_set_system_basic.result
--- a/mysql-test/r/collation_connection_basic.result
+++ b/mysql-test/r/collation_connection_basic.result
--- a/mysql-test/r/collation_connection_func.result
+++ b/mysql-test/r/collation_connection_func.result
--- a/mysql-test/r/collation_database_basic.result
+++ b/mysql-test/r/collation_database_basic.result
--- a/mysql-test/r/collation_database_func.result
+++ b/mysql-test/r/collation_database_func.result
--- a/mysql-test/r/collation_server_basic.result
+++ b/mysql-test/r/collation_server_basic.result
--- a/mysql-test/r/collation_server_func.result
+++ b/mysql-test/r/collation_server_func.result
--- a/mysql-test/r/completion_type_basic.result
+++ b/mysql-test/r/completion_type_basic.result
--- a/mysql-test/r/completion_type_func.result
+++ b/mysql-test/r/completion_type_func.result
--- a/mysql-test/r/concurrent_insert_basic.result
+++ b/mysql-test/r/concurrent_insert_basic.result
--- a/mysql-test/r/concurrent_insert_func.result
+++ b/mysql-test/r/concurrent_insert_func.result
--- a/mysql-test/r/connect_timeout_basic.result
+++ b/mysql-test/r/connect_timeout_basic.result
--- a/mysql-test/r/datadir_basic.result
+++ b/mysql-test/r/datadir_basic.result
--- a/mysql-test/r/default_week_format_basic.result
+++ b/mysql-test/r/default_week_format_basic.result
--- a/mysql-test/r/default_week_format_func.result
+++ b/mysql-test/r/default_week_format_func.result
--- a/mysql-test/r/delay_key_write_basic.result
+++ b/mysql-test/r/delay_key_write_basic.result
--- a/mysql-test/r/delay_key_write_func.result
+++ b/mysql-test/r/delay_key_write_func.result
--- a/mysql-test/r/delayed_insert_limit_func.result
+++ b/mysql-test/r/delayed_insert_limit_func.result
--- a/mysql-test/r/delayed_insert_timeout_basic.result
+++ b/mysql-test/r/delayed_insert_timeout_basic.result
--- a/mysql-test/r/div_precision_increment_basic.result
+++ b/mysql-test/r/div_precision_increment_basic.result
--- a/mysql-test/r/div_precision_increment_func.result
+++ b/mysql-test/r/div_precision_increment_func.result
--- a/mysql-test/r/engine_condition_pushdown_basic.result
+++ b/mysql-test/r/engine_condition_pushdown_basic.result
--- a/mysql-test/r/error_count_basic.result
+++ b/mysql-test/r/error_count_basic.result
--- a/mysql-test/r/event_scheduler_basic.result
+++ b/mysql-test/r/event_scheduler_basic.result
--- a/mysql-test/r/event_scheduler_func.result
+++ b/mysql-test/r/event_scheduler_func.result
--- a/mysql-test/r/expire_logs_days_basic.result
+++ b/mysql-test/r/expire_logs_days_basic.result
--- a/mysql-test/r/flush_basic.result
+++ b/mysql-test/r/flush_basic.result
--- a/mysql-test/r/foreign_key_checks_basic.result
+++ b/mysql-test/r/foreign_key_checks_basic.result
--- a/mysql-test/r/foreign_key_checks_func.result
+++ b/mysql-test/r/foreign_key_checks_func.result
--- a/mysql-test/r/ft_boolean_syntax_basic.result
+++ b/mysql-test/r/ft_boolean_syntax_basic.result
--- a/mysql-test/r/ft_boolean_syntax_func.result
+++ b/mysql-test/r/ft_boolean_syntax_func.result
--- a/mysql-test/r/general_log_basic.result
+++ b/mysql-test/r/general_log_basic.result
--- a/mysql-test/r/general_log_file_basic.result
+++ b/mysql-test/r/general_log_file_basic.result
--- a/mysql-test/r/general_log_file_func.result
+++ b/mysql-test/r/general_log_file_func.result
--- a/mysql-test/r/general_log_func.result
+++ b/mysql-test/r/general_log_func.result
--- a/mysql-test/r/group_concat_max_len_basic.result
+++ b/mysql-test/r/group_concat_max_len_basic.result
--- a/mysql-test/r/group_concat_max_len_func.result
+++ b/mysql-test/r/group_concat_max_len_func.result
--- a/mysql-test/r/have_compress_basic.result
+++ b/mysql-test/r/have_compress_basic.result
--- a/mysql-test/r/have_crypt_basic.result
+++ b/mysql-test/r/have_crypt_basic.result
--- a/mysql-test/r/have_csv_basic.result
+++ b/mysql-test/r/have_csv_basic.result
--- a/mysql-test/r/have_dynamic_loading_basic.result
+++ b/mysql-test/r/have_dynamic_loading_basic.result
--- a/mysql-test/r/have_geometry_basic.result
+++ b/mysql-test/r/have_geometry_basic.result
--- a/mysql-test/r/have_innodb_basic.result
+++ b/mysql-test/r/have_innodb_basic.result
--- a/mysql-test/r/have_ndbcluster_basic.result
+++ b/mysql-test/r/have_ndbcluster_basic.result
--- a/mysql-test/r/have_openssl_basic.result
+++ b/mysql-test/r/have_openssl_basic.result
--- a/mysql-test/r/have_partitioning_basic.result
+++ b/mysql-test/r/have_partitioning_basic.result
--- a/mysql-test/r/have_query_cache_basic.result
+++ b/mysql-test/r/have_query_cache_basic.result
--- a/mysql-test/r/have_rtree_keys_basic.result
+++ b/mysql-test/r/have_rtree_keys_basic.result
--- a/mysql-test/r/have_ssl_basic.result
+++ b/mysql-test/r/have_ssl_basic.result
--- a/mysql-test/r/have_symlink_basic.result
+++ b/mysql-test/r/have_symlink_basic.result
--- a/mysql-test/r/hostname_basic.result
+++ b/mysql-test/r/hostname_basic.result
--- a/mysql-test/r/identity_basic.result
+++ b/mysql-test/r/identity_basic.result
--- a/mysql-test/r/identity_func.result
+++ b/mysql-test/r/identity_func.result
--- a/mysql-test/r/init_connect_basic.result
+++ b/mysql-test/r/init_connect_basic.result
--- a/mysql-test/r/init_slave_basic.result
+++ b/mysql-test/r/init_slave_basic.result
--- a/mysql-test/r/innodb_additional_mem_pool_size_basic.result
+++ b/mysql-test/r/innodb_additional_mem_pool_size_basic.result
--- a/mysql-test/r/innodb_autoextend_increment_basic.result
+++ b/mysql-test/r/innodb_autoextend_increment_basic.result
--- a/mysql-test/r/innodb_autoinc_lock_mode_basic.result
+++ b/mysql-test/r/innodb_autoinc_lock_mode_basic.result
--- a/mysql-test/r/innodb_autoinc_lock_mode_func.result
+++ b/mysql-test/r/innodb_autoinc_lock_mode_func.result
--- a/mysql-test/r/innodb_buffer_pool_size_basic.result
+++ b/mysql-test/r/innodb_buffer_pool_size_basic.result
--- a/mysql-test/r/innodb_checksums_basic.result
+++ b/mysql-test/r/innodb_checksums_basic.result
--- a/mysql-test/r/innodb_commit_concurrency_basic.result
+++ b/mysql-test/r/innodb_commit_concurrency_basic.result
--- a/mysql-test/r/innodb_data_file_path_basic.result
+++ b/mysql-test/r/innodb_data_file_path_basic.result
--- a/mysql-test/r/innodb_data_home_dir_basic.result
+++ b/mysql-test/r/innodb_data_home_dir_basic.result
--- a/mysql-test/r/innodb_doublewrite_basic.result
+++ b/mysql-test/r/innodb_doublewrite_basic.result
--- a/mysql-test/r/innodb_fast_shutdown_basic.result
+++ b/mysql-test/r/innodb_fast_shutdown_basic.result
--- a/mysql-test/r/innodb_file_io_threads_basic.result
+++ b/mysql-test/r/innodb_file_io_threads_basic.result
--- a/mysql-test/r/innodb_file_per_table_basic.result
+++ b/mysql-test/r/innodb_file_per_table_basic.result
--- a/mysql-test/r/innodb_flush_log_at_trx_commit_basic.result
+++ b/mysql-test/r/innodb_flush_log_at_trx_commit_basic.result
--- a/mysql-test/r/innodb_flush_method_basic.result
+++ b/mysql-test/r/innodb_flush_method_basic.result
--- a/mysql-test/r/innodb_force_recovery_basic.result
+++ b/mysql-test/r/innodb_force_recovery_basic.result
--- a/mysql-test/r/innodb_lock_wait_timeout_basic.result
+++ b/mysql-test/r/innodb_lock_wait_timeout_basic.result
--- a/mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result
+++ b/mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result
--- a/mysql-test/r/innodb_log_buffer_size_basic.result
+++ b/mysql-test/r/innodb_log_buffer_size_basic.result
--- a/mysql-test/r/innodb_log_file_size_basic.result
+++ b/mysql-test/r/innodb_log_file_size_basic.result
--- a/mysql-test/r/innodb_log_files_in_group_basic.result
+++ b/mysql-test/r/innodb_log_files_in_group_basic.result
--- a/mysql-test/r/innodb_log_group_home_dir_basic.result
+++ b/mysql-test/r/innodb_log_group_home_dir_basic.result
--- a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result
+++ b/mysql-test/r/innodb_max_dirty_pages_pct_basic.result
--- a/mysql-test/r/innodb_max_dirty_pages_pct_func.result
+++ b/mysql-test/r/innodb_max_dirty_pages_pct_func.result
--- a/mysql-test/r/innodb_mirrored_log_groups_basic.result
+++ b/mysql-test/r/innodb_mirrored_log_groups_basic.result
--- a/mysql-test/r/innodb_open_files_basic.result
+++ b/mysql-test/r/innodb_open_files_basic.result
--- a/mysql-test/r/innodb_rollback_on_timeout_basic.result
+++ b/mysql-test/r/innodb_rollback_on_timeout_basic.result
--- a/mysql-test/r/innodb_support_xa_basic.result
+++ b/mysql-test/r/innodb_support_xa_basic.result
--- a/mysql-test/r/innodb_support_xa_func.result
+++ b/mysql-test/r/innodb_support_xa_func.result
--- a/mysql-test/r/innodb_table_locks_basic.result
+++ b/mysql-test/r/innodb_table_locks_basic.result
--- a/mysql-test/r/innodb_table_locks_func.result
+++ b/mysql-test/r/innodb_table_locks_func.result
--- a/mysql-test/r/innodb_thread_concurrency_basic.result
+++ b/mysql-test/r/innodb_thread_concurrency_basic.result
--- a/mysql-test/r/innodb_thread_sleep_delay_basic.result
+++ b/mysql-test/r/innodb_thread_sleep_delay_basic.result
--- a/mysql-test/r/insert_id_basic.result
+++ b/mysql-test/r/insert_id_basic.result
--- a/mysql-test/r/insert_id_func.result
+++ b/mysql-test/r/insert_id_func.result
--- a/mysql-test/r/interactive_timeout_basic.result
+++ b/mysql-test/r/interactive_timeout_basic.result
--- a/mysql-test/r/interactive_timeout_func.result
+++ b/mysql-test/r/interactive_timeout_func.result
--- a/mysql-test/r/keep_files_on_create_basic.result
+++ b/mysql-test/r/keep_files_on_create_basic.result
--- a/mysql-test/r/key_buffer_size_func.result
+++ b/mysql-test/r/key_buffer_size_func.result
--- a/mysql-test/r/last_insert_id_func.result
+++ b/mysql-test/r/last_insert_id_func.result
--- a/mysql-test/r/lc_time_names_basic.result
+++ b/mysql-test/r/lc_time_names_basic.result
--- a/mysql-test/r/lc_time_names_func.result
+++ b/mysql-test/r/lc_time_names_func.result
--- a/mysql-test/r/license_basic.result
+++ b/mysql-test/r/license_basic.result
--- a/mysql-test/r/local_infile_basic.result
+++ b/mysql-test/r/local_infile_basic.result
--- a/mysql-test/r/local_infile_func.result
+++ b/mysql-test/r/local_infile_func.result
--- a/mysql-test/r/log_basic.result
+++ b/mysql-test/r/log_basic.result
--- a/mysql-test/r/log_bin_trust_function_creators_basic.result
+++ b/mysql-test/r/log_bin_trust_function_creators_basic.result
--- a/mysql-test/r/log_bin_trust_function_creators_func.result
+++ b/mysql-test/r/log_bin_trust_function_creators_func.result
--- a/mysql-test/r/log_bin_trust_routine_creators_basic.result
+++ b/mysql-test/r/log_bin_trust_routine_creators_basic.result
--- a/mysql-test/r/log_output_basic.result
+++ b/mysql-test/r/log_output_basic.result
--- a/mysql-test/r/log_output_func.result
+++ b/mysql-test/r/log_output_func.result
--- a/mysql-test/r/log_queries_not_using_indexes_basic.result
+++ b/mysql-test/r/log_queries_not_using_indexes_basic.result
--- a/mysql-test/r/long_query_time_basic.result
+++ b/mysql-test/r/long_query_time_basic.result
--- a/mysql-test/r/low_priority_updates_basic.result
+++ b/mysql-test/r/low_priority_updates_basic.result
--- a/mysql-test/r/max_allowed_packet_basic.result
+++ b/mysql-test/r/max_allowed_packet_basic.result
--- a/mysql-test/r/max_allowed_packet_func.result
+++ b/mysql-test/r/max_allowed_packet_func.result
--- a/mysql-test/r/max_binlog_cache_size_func.result
+++ b/mysql-test/r/max_binlog_cache_size_func.result
--- a/mysql-test/r/max_binlog_size_basic.result
+++ b/mysql-test/r/max_binlog_size_basic.result
--- a/mysql-test/r/max_connections_basic.result
+++ b/mysql-test/r/max_connections_basic.result
--- a/mysql-test/r/max_delayed_threads_basic.result
+++ b/mysql-test/r/max_delayed_threads_basic.result
--- a/mysql-test/r/max_error_count_basic.result
+++ b/mysql-test/r/max_error_count_basic.result
--- a/mysql-test/r/max_insert_delayed_threads_basic.result
+++ b/mysql-test/r/max_insert_delayed_threads_basic.result
--- a/mysql-test/r/max_join_size_func.result
+++ b/mysql-test/r/max_join_size_func.result
--- a/mysql-test/r/max_length_for_sort_data_basic.result
+++ b/mysql-test/r/max_length_for_sort_data_basic.result
--- a/mysql-test/r/max_prepared_stmt_count_basic.result
+++ b/mysql-test/r/max_prepared_stmt_count_basic.result
--- a/mysql-test/r/max_prepared_stmt_count_func.result
+++ b/mysql-test/r/max_prepared_stmt_count_func.result
--- a/mysql-test/r/max_relay_log_size_basic.result
+++ b/mysql-test/r/max_relay_log_size_basic.result
--- a/mysql-test/r/max_seeks_for_key_func.result
+++ b/mysql-test/r/max_seeks_for_key_func.result
--- a/mysql-test/r/max_sort_length_basic.result
+++ b/mysql-test/r/max_sort_length_basic.result
--- a/mysql-test/r/max_sort_length_func.result
+++ b/mysql-test/r/max_sort_length_func.result
--- a/mysql-test/r/max_sp_recursion_depth_basic.result
+++ b/mysql-test/r/max_sp_recursion_depth_basic.result
--- a/mysql-test/r/max_sp_recursion_depth_func.result
+++ b/mysql-test/r/max_sp_recursion_depth_func.result
--- a/mysql-test/r/max_user_connections_basic.result
+++ b/mysql-test/r/max_user_connections_basic.result
--- a/mysql-test/r/max_user_connections_func.result
+++ b/mysql-test/r/max_user_connections_func.result
--- a/mysql-test/r/myisam_data_pointer_size_basic.result
+++ b/mysql-test/r/myisam_data_pointer_size_basic.result
--- a/mysql-test/r/myisam_data_pointer_size_func.result
+++ b/mysql-test/r/myisam_data_pointer_size_func.result
--- a/mysql-test/r/myisam_sort_buffer_size_basic.result
+++ b/mysql-test/r/myisam_sort_buffer_size_basic.result
--- a/mysql-test/r/myisam_stats_method_basic.result
+++ b/mysql-test/r/myisam_stats_method_basic.result
--- a/mysql-test/r/myisam_stats_method_func.result
+++ b/mysql-test/r/myisam_stats_method_func.result
--- a/mysql-test/r/myisam_use_mmap_basic.result
+++ b/mysql-test/r/myisam_use_mmap_basic.result
--- a/mysql-test/r/ndb_log_update_as_write_basic.result
+++ b/mysql-test/r/ndb_log_update_as_write_basic.result
--- a/mysql-test/r/ndb_log_updated_only_basic.result
+++ b/mysql-test/r/ndb_log_updated_only_basic.result
--- a/mysql-test/r/net_buffer_length_basic.result
+++ b/mysql-test/r/net_buffer_length_basic.result
--- a/mysql-test/r/net_read_timeout_basic.result
+++ b/mysql-test/r/net_read_timeout_basic.result
--- a/mysql-test/r/net_write_timeout_basic.result
+++ b/mysql-test/r/net_write_timeout_basic.result
--- a/mysql-test/r/new_basic.result
+++ b/mysql-test/r/new_basic.result
--- a/mysql-test/r/old_passwords_basic.result
+++ b/mysql-test/r/old_passwords_basic.result
--- a/mysql-test/r/old_passwords_func.result
+++ b/mysql-test/r/old_passwords_func.result
--- a/mysql-test/r/optimizer_prune_level_basic.result
+++ b/mysql-test/r/optimizer_prune_level_basic.result
--- a/mysql-test/r/optimizer_search_depth_basic.result
+++ b/mysql-test/r/optimizer_search_depth_basic.result
--- a/mysql-test/r/preload_buffer_size_basic.result
+++ b/mysql-test/r/preload_buffer_size_basic.result
--- a/mysql-test/r/query_cache_limit_func.result
+++ b/mysql-test/r/query_cache_limit_func.result
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
 SET @start_value = @@global.query_cache_size;
 SELECT @start_value;
 @start_value
-0
+131072
 '#--------------------FN_DYNVARS_133_01------------------------#'
 SET @@global.query_cache_size = 99;
 SET @@global.query_cache_size = DEFAULT;
@@ -12,7 +12,7 @@ SELECT @@global.query_cache_size;
 SET @@global.query_cache_size = @start_value;
 SELECT @@global.query_cache_size = 0;
 @@global.query_cache_size = 0
-1
+0
 '#--------------------FN_DYNVARS_133_03------------------------#'
 SET @@global.query_cache_size = 0;
 SELECT @@global.query_cache_size;
@@ -135,4 +135,4 @@ ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
 SET @@global.query_cache_size = @start_value;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
-0
+131072
--- a/mysql-test/r/query_cache_type_basic.result
+++ b/mysql-test/r/query_cache_type_basic.result
--- a/mysql-test/r/query_cache_type_func.result
+++ b/mysql-test/r/query_cache_type_func.result
--- a/mysql-test/r/query_cache_wlock_invalidate_basic.result
+++ b/mysql-test/r/query_cache_wlock_invalidate_basic.result
--- a/mysql-test/r/query_cache_wlock_invalidate_func.result
+++ b/mysql-test/r/query_cache_wlock_invalidate_func.result
--- a/mysql-test/r/query_prealloc_size_func.result
+++ b/mysql-test/r/query_prealloc_size_func.result
--- a/mysql-test/r/read_buffer_size_basic.result
+++ b/mysql-test/r/read_buffer_size_basic.result
--- a/mysql-test/r/read_only_basic.result
+++ b/mysql-test/r/read_only_basic.result
--- a/mysql-test/r/read_only_func.result
+++ b/mysql-test/r/read_only_func.result
--- a/mysql-test/r/read_rnd_buffer_size_basic.result
+++ b/mysql-test/r/read_rnd_buffer_size_basic.result
--- a/mysql-test/r/relay_log_purge_basic.result
+++ b/mysql-test/r/relay_log_purge_basic.result
--- a/mysql-test/r/rpl_init_slave_func.result
+++ b/mysql-test/r/rpl_init_slave_func.result
--- a/mysql-test/r/rpl_max_binlog_size_func.result
+++ b/mysql-test/r/rpl_max_binlog_size_func.result
@@ -3,3 +3,4 @@ DROP TABLE IF EXISTS t1;
 SET @@global.max_binlog_size = 4096;
 CREATE TABLE t1(a CHAR(5));
 'mylog.000002 exists'
+DROP TABLE t1;
--- a/mysql-test/r/secure_auth_basic.result
+++ b/mysql-test/r/secure_auth_basic.result
--- a/mysql-test/r/secure_auth_func.result
+++ b/mysql-test/r/secure_auth_func.result
--- a/mysql-test/r/slave_allow_batching_basic.result
+++ b/mysql-test/r/slave_allow_batching_basic.result
--- a/mysql-test/r/slave_compressed_protocol_basic.result
+++ b/mysql-test/r/slave_compressed_protocol_basic.result
--- a/mysql-test/r/slave_exec_mode_basic.result
+++ b/mysql-test/r/slave_exec_mode_basic.result
--- a/mysql-test/r/slave_net_timeout_basic.result
+++ b/mysql-test/r/slave_net_timeout_basic.result
--- a/mysql-test/r/slow_launch_time_basic.result
+++ b/mysql-test/r/slow_launch_time_basic.result
--- a/mysql-test/r/slow_launch_time_func.result
+++ b/mysql-test/r/slow_launch_time_func.result
--- a/mysql-test/r/slow_query_log_basic.result
+++ b/mysql-test/r/slow_query_log_basic.result
--- a/mysql-test/r/slow_query_log_file_basic.result
+++ b/mysql-test/r/slow_query_log_file_basic.result
--- a/mysql-test/r/slow_query_log_file_func.result
+++ b/mysql-test/r/slow_query_log_file_func.result
--- a/mysql-test/r/slow_query_log_func.result
+++ b/mysql-test/r/slow_query_log_func.result
--- a/mysql-test/r/sql_auto_is_null_basic.result
+++ b/mysql-test/r/sql_auto_is_null_basic.result
--- a/mysql-test/r/sql_big_selects_basic.result
+++ b/mysql-test/r/sql_big_selects_basic.result
--- a/mysql-test/r/sql_big_selects_func.result
+++ b/mysql-test/r/sql_big_selects_func.result
--- a/mysql-test/r/sql_big_tables_basic.result
+++ b/mysql-test/r/sql_big_tables_basic.result
--- a/mysql-test/r/sql_big_tables_func.result
+++ b/mysql-test/r/sql_big_tables_func.result
--- a/mysql-test/r/sql_buffer_result_basic.result
+++ b/mysql-test/r/sql_buffer_result_basic.result
--- a/mysql-test/r/sql_buffer_result_func.result
+++ b/mysql-test/r/sql_buffer_result_func.result
--- a/mysql-test/r/sql_log_bin_basic.result
+++ b/mysql-test/r/sql_log_bin_basic.result
--- a/mysql-test/r/sql_log_off_basic.result
+++ b/mysql-test/r/sql_log_off_basic.result
--- a/mysql-test/r/sql_log_off_func.result
+++ b/mysql-test/r/sql_log_off_func.result
--- a/mysql-test/r/sql_low_priority_updates_basic.result
+++ b/mysql-test/r/sql_low_priority_updates_basic.result
--- a/mysql-test/r/sql_low_priority_updates_func.result
+++ b/mysql-test/r/sql_low_priority_updates_func.result
--- a/mysql-test/r/sql_max_join_size_func.result
+++ b/mysql-test/r/sql_max_join_size_func.result
--- a/mysql-test/r/sql_mode_basic.result
+++ b/mysql-test/r/sql_mode_basic.result
--- a/mysql-test/r/sql_mode_func.result
+++ b/mysql-test/r/sql_mode_func.result
--- a/mysql-test/r/sql_notes_basic.result
+++ b/mysql-test/r/sql_notes_basic.result
--- a/mysql-test/r/sql_notes_func.result
+++ b/mysql-test/r/sql_notes_func.result
--- a/mysql-test/r/sql_quote_show_create_basic.result
+++ b/mysql-test/r/sql_quote_show_create_basic.result
--- a/mysql-test/r/sql_quote_show_create_func.result
+++ b/mysql-test/r/sql_quote_show_create_func.result
--- a/mysql-test/r/sql_safe_updates_basic.result
+++ b/mysql-test/r/sql_safe_updates_basic.result
--- a/mysql-test/r/sql_safe_updates_func.result
+++ b/mysql-test/r/sql_safe_updates_func.result
--- a/mysql-test/r/sql_select_limit_func.result
+++ b/mysql-test/r/sql_select_limit_func.result
--- a/mysql-test/r/sql_slave_skip_counter_basic.result
+++ b/mysql-test/r/sql_slave_skip_counter_basic.result
--- a/mysql-test/r/sql_warnings_basic.result
+++ b/mysql-test/r/sql_warnings_basic.result
--- a/mysql-test/r/sql_warnings_func.result
+++ b/mysql-test/r/sql_warnings_func.result
--- a/mysql-test/r/ssl_ca_basic.result
+++ b/mysql-test/r/ssl_ca_basic.result
--- a/mysql-test/r/ssl_capath_basic.result
+++ b/mysql-test/r/ssl_capath_basic.result
--- a/mysql-test/r/ssl_cert_basic.result
+++ b/mysql-test/r/ssl_cert_basic.result
--- a/mysql-test/r/ssl_cipher_basic.result
+++ b/mysql-test/r/ssl_cipher_basic.result
--- a/mysql-test/r/ssl_key_basic.result
+++ b/mysql-test/r/ssl_key_basic.result
--- a/mysql-test/r/storage_engine_basic.result
+++ b/mysql-test/r/storage_engine_basic.result
--- a/mysql-test/r/sync_frm_basic.result
+++ b/mysql-test/r/sync_frm_basic.result
--- a/mysql-test/r/system_time_zone_basic.result
+++ b/mysql-test/r/system_time_zone_basic.result
--- a/mysql-test/r/table_definition_cache_basic.result
+++ b/mysql-test/r/table_definition_cache_basic.result
--- a/mysql-test/r/table_lock_wait_timeout_basic.result
+++ b/mysql-test/r/table_lock_wait_timeout_basic.result
--- a/mysql-test/r/table_open_cache_basic.result
+++ b/mysql-test/r/table_open_cache_basic.result
--- a/mysql-test/r/thread_cache_size_func.result
+++ b/mysql-test/r/thread_cache_size_func.result
--- a/mysql-test/r/thread_handling_basic.result
+++ b/mysql-test/r/thread_handling_basic.result
--- a/mysql-test/r/time_zone_basic.result
+++ b/mysql-test/r/time_zone_basic.result
--- a/mysql-test/r/time_zone_func.result
+++ b/mysql-test/r/time_zone_func.result
--- a/mysql-test/r/timed_mutexes_basic.result
+++ b/mysql-test/r/timed_mutexes_basic.result
--- a/mysql-test/r/timestamp_func.result
+++ b/mysql-test/r/timestamp_func.result
--- a/mysql-test/r/timestamp_sysdate_is_now_func.result
+++ b/mysql-test/r/timestamp_sysdate_is_now_func.result
--- a/mysql-test/r/tmpdir_basic.result
+++ b/mysql-test/r/tmpdir_basic.result
--- a/mysql-test/r/tx_isolation_basic.result
+++ b/mysql-test/r/tx_isolation_basic.result
--- a/mysql-test/r/tx_isolation_func.result
+++ b/mysql-test/r/tx_isolation_func.result
--- a/mysql-test/r/unique_checks_basic.result
+++ b/mysql-test/r/unique_checks_basic.result
--- a/mysql-test/r/updatable_views_with_limit_basic.result
+++ b/mysql-test/r/updatable_views_with_limit_basic.result
--- a/mysql-test/r/updatable_views_with_limit_func.result
+++ b/mysql-test/r/updatable_views_with_limit_func.result
--- a/mysql-test/r/version_basic.result
+++ b/mysql-test/r/version_basic.result
--- a/mysql-test/r/version_comment_basic.result
+++ b/mysql-test/r/version_comment_basic.result
--- a/mysql-test/r/version_compile_machine_basic.result
+++ b/mysql-test/r/version_compile_machine_basic.result
--- a/mysql-test/r/version_compile_os_basic.result
+++ b/mysql-test/r/version_compile_os_basic.result
--- a/mysql-test/r/wait_timeout_func.result
+++ b/mysql-test/r/wait_timeout_func.result
--- a/mysql-test/r/warning_count_basic.result
+++ b/mysql-test/r/warning_count_basic.result
--- a/mysql-test/t/auto_commit_basic.test
+++ b/mysql-test/t/auto_commit_basic.test
--- a/mysql-test/t/auto_increment_increment_basic.test
+++ b/mysql-test/t/auto_increment_increment_basic.test
--- a/mysql-test/t/auto_increment_increment_func.test
+++ b/mysql-test/t/auto_increment_increment_func.test
--- a/mysql-test/t/auto_increment_offset_basic.test
+++ b/mysql-test/t/auto_increment_offset_basic.test
--- a/mysql-test/t/auto_increment_offset_func.test
+++ b/mysql-test/t/auto_increment_offset_func.test
--- a/mysql-test/t/autocommit_func-master.opt
+++ b/mysql-test/t/autocommit_func-master.opt
--- a/mysql-test/t/autocommit_func.test
+++ b/mysql-test/t/autocommit_func.test
--- a/mysql-test/t/automatic_sp_privileges_basic.test
+++ b/mysql-test/t/automatic_sp_privileges_basic.test
--- a/mysql-test/t/automatic_sp_privileges_func.test
+++ b/mysql-test/t/automatic_sp_privileges_func.test
--- a/mysql-test/t/basedir_basic.test
+++ b/mysql-test/t/basedir_basic.test
--- a/mysql-test/t/big_tables_basic.test
+++ b/mysql-test/t/big_tables_basic.test
--- a/mysql-test/t/binlog_format_basic.test
+++ b/mysql-test/t/binlog_format_basic.test
--- a/mysql-test/t/character_set_client_basic.test
+++ b/mysql-test/t/character_set_client_basic.test
@@ -207,7 +207,7 @@ SELECT @@character_set_client;
 let charset_variable = @@global.character_set_client;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_010_08-------------------------#'
 ################################################################################

--- a/mysql-test/t/character_set_client_func.test
+++ b/mysql-test/t/character_set_client_func.test
--- a/mysql-test/t/character_set_connection_basic.test
+++ b/mysql-test/t/character_set_connection_basic.test
@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 + latin2;
 ##############################################################################
 let charset_variable = @@session.character_set_connection;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_011_07-------------------------#'
@@ -131,7 +131,7 @@ let charset_variable = @@session.character_set_connection;
 ##############################################################################
 let charset_variable = @@global.character_set_connection;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_011_08-------------------------#'

--- a/mysql-test/t/character_set_connection_func.test
+++ b/mysql-test/t/character_set_connection_func.test
--- a/mysql-test/t/character_set_database_basic.test
+++ b/mysql-test/t/character_set_database_basic.test
@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + latin2;
 #############################################################################
 let charset_variable = @@session.character_set_database;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_012_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_database;
 ##############################################################################
 let charset_variable = @@global.character_set_database;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_012_08-------------------------#'

--- a/mysql-test/t/character_set_database_func.test
+++ b/mysql-test/t/character_set_database_func.test
--- a/mysql-test/t/character_set_filesystem_basic.test
+++ b/mysql-test/t/character_set_filesystem_basic.test
@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 + latin2;
 ###############################################################################
 let charset_variable = @@session.character_set_filesystem;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_008_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_filesystem;
 ##############################################################################
 let charset_variable = @@global.character_set_filesystem;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_008_08-------------------------#'

--- a/mysql-test/t/character_set_filesystem_func-master.opt
+++ b/mysql-test/t/character_set_filesystem_func-master.opt
--- a/mysql-test/t/character_set_results_basic.test
+++ b/mysql-test/t/character_set_results_basic.test
@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + latin2;
 ##############################################################################
 let charset_variable = @@session.character_set_results;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_013_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_results;
 ###############################################################################
 let charset_variable = @@global.character_set_results;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_013_08-------------------------#'

--- a/mysql-test/t/character_set_results_func.test
+++ b/mysql-test/t/character_set_results_func.test
--- a/mysql-test/t/character_set_server_basic.test
+++ b/mysql-test/t/character_set_server_basic.test
@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + latin2;
 let charset_variable = @@session.character_set_server;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_009_07-------------------------#'
@@ -132,7 +132,7 @@ let charset_variable = @@session.character_set_server;
 ###############################################################################
 let charset_variable = @@global.character_set_server;
--source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
 --echo '#--------------------FN_DYNVARS_009_08-------------------------#'

--- a/mysql-test/t/character_set_server_func.test
+++ b/mysql-test/t/character_set_server_func.test
--- a/mysql-test/t/character_set_system_basic.test
+++ b/mysql-test/t/character_set_system_basic.test
--- a/mysql-test/t/collation_connection_basic.test
+++ b/mysql-test/t/collation_connection_basic.test
@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_general_ci + latin7_general_cs;
 ###############################################################################
 let collation_variable = @@session.collation_connection;
--source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 --echo '#--------------------FN_DYNVARS_015_07-------------------------#'
@@ -131,7 +131,7 @@ let collation_variable = @@session.collation_connection;
 ###############################################################################
 let collation_variable = @@global.collation_connection;
--source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 --echo '#--------------------FN_DYNVARS_015_08-------------------------#'

--- a/mysql-test/t/collation_connection_func.test
+++ b/mysql-test/t/collation_connection_func.test
--- a/mysql-test/t/collation_database_basic.test
+++ b/mysql-test/t/collation_database_basic.test
@@ -121,7 +121,7 @@ SET @@collation_database = latin7_general_ci + latin7_general_cs;
 ###########################################################################
 let collation_variable = @@session.collation_database;
--source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 --echo '#--------------------FN_DYNVARS_016_07-------------------------#'
@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_database;
 ###############################################################################
 let collation_variable = @@global.collation_database;
--source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 --echo '#--------------------FN_DYNVARS_016_08-------------------------#'

--- a/mysql-test/t/collation_database_func.test
+++ b/mysql-test/t/collation_database_func.test
--- a/mysql-test/t/collation_server_basic.test
+++ b/mysql-test/t/collation_server_basic.test
@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_ci + latin7_general_cs;
 ##############################################################################
 let collation_variable = @@session.collation_server;
--source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 --echo '#--------------------FN_DYNVARS_014_07-------------------------#'
@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_server;
 #############################################################################
 let collation_variable = @@global.collation_server;
--source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
 --echo '#--------------------FN_DYNVARS_014_08-------------------------#'

--- a/mysql-test/t/collation_server_func.test
+++ b/mysql-test/t/collation_server_func.test
--- a/mysql-test/t/completion_type_basic.test
+++ b/mysql-test/t/completion_type_basic.test
--- a/mysql-test/t/completion_type_func-master.opt
+++ b/mysql-test/t/completion_type_func-master.opt
--- a/mysql-test/t/completion_type_func.test
+++ b/mysql-test/t/completion_type_func.test
--- a/mysql-test/t/concurrent_insert_basic.test
+++ b/mysql-test/t/concurrent_insert_basic.test
--- a/mysql-test/t/concurrent_insert_func.test
+++ b/mysql-test/t/concurrent_insert_func.test
--- a/mysql-test/t/connect_timeout_basic.test
+++ b/mysql-test/t/connect_timeout_basic.test
--- a/mysql-test/t/datadir_basic.test
+++ b/mysql-test/t/datadir_basic.test
--- a/mysql-test/t/default_week_format_basic.test
+++ b/mysql-test/t/default_week_format_basic.test
--- a/mysql-test/t/default_week_format_func.test
+++ b/mysql-test/t/default_week_format_func.test
--- a/mysql-test/t/delay_key_write_basic.test
+++ b/mysql-test/t/delay_key_write_basic.test
--- a/mysql-test/t/delay_key_write_func-master.opt
+++ b/mysql-test/t/delay_key_write_func-master.opt
--- a/mysql-test/t/delay_key_write_func.test
+++ b/mysql-test/t/delay_key_write_func.test
--- a/mysql-test/t/delayed_insert_limit_func.test
+++ b/mysql-test/t/delayed_insert_limit_func.test
--- a/mysql-test/t/delayed_insert_timeout_basic.test
+++ b/mysql-test/t/delayed_insert_timeout_basic.test
--- a/mysql-test/t/div_precision_increment_basic.test
+++ b/mysql-test/t/div_precision_increment_basic.test
--- a/mysql-test/t/div_precision_increment_func.test
+++ b/mysql-test/t/div_precision_increment_func.test
--- a/mysql-test/t/engine_condition_pushdown_basic.test
+++ b/mysql-test/t/engine_condition_pushdown_basic.test
--- a/mysql-test/t/error_count_basic.test
+++ b/mysql-test/t/error_count_basic.test
--- a/mysql-test/t/event_scheduler_basic.test
+++ b/mysql-test/t/event_scheduler_basic.test
--- a/mysql-test/t/event_scheduler_func.test
+++ b/mysql-test/t/event_scheduler_func.test
--- a/mysql-test/t/expire_logs_days_basic.test
+++ b/mysql-test/t/expire_logs_days_basic.test
--- a/mysql-test/t/flush_basic.test
+++ b/mysql-test/t/flush_basic.test
--- a/mysql-test/t/foreign_key_checks_basic.test
+++ b/mysql-test/t/foreign_key_checks_basic.test
--- a/mysql-test/t/foreign_key_checks_func.test
+++ b/mysql-test/t/foreign_key_checks_func.test
--- a/mysql-test/t/ft_boolean_syntax_basic.test
+++ b/mysql-test/t/ft_boolean_syntax_basic.test
--- a/mysql-test/t/ft_boolean_syntax_func.test
+++ b/mysql-test/t/ft_boolean_syntax_func.test
--- a/mysql-test/t/general_log_basic.test
+++ b/mysql-test/t/general_log_basic.test
--- a/mysql-test/t/general_log_file_basic-master.opt
+++ b/mysql-test/t/general_log_file_basic-master.opt
--- a/mysql-test/t/general_log_file_basic.test
+++ b/mysql-test/t/general_log_file_basic.test
--- a/mysql-test/t/general_log_file_func-master.opt
+++ b/mysql-test/t/general_log_file_func-master.opt
--- a/mysql-test/t/general_log_file_func.test
+++ b/mysql-test/t/general_log_file_func.test
--- a/mysql-test/t/general_log_func.test
+++ b/mysql-test/t/general_log_func.test
--- a/mysql-test/t/group_concat_max_len_basic.test
+++ b/mysql-test/t/group_concat_max_len_basic.test
--- a/mysql-test/t/group_concat_max_len_func.test
+++ b/mysql-test/t/group_concat_max_len_func.test
--- a/mysql-test/t/have_compress_basic.test
+++ b/mysql-test/t/have_compress_basic.test
--- a/mysql-test/t/have_crypt_basic.test
+++ b/mysql-test/t/have_crypt_basic.test
--- a/mysql-test/t/have_csv_basic.test
+++ b/mysql-test/t/have_csv_basic.test
--- a/mysql-test/t/have_dynamic_loading_basic.test
+++ b/mysql-test/t/have_dynamic_loading_basic.test
--- a/mysql-test/t/have_geometry_basic.test
+++ b/mysql-test/t/have_geometry_basic.test
--- a/mysql-test/t/have_innodb_basic.test
+++ b/mysql-test/t/have_innodb_basic.test
--- a/mysql-test/t/have_ndbcluster_basic.test
+++ b/mysql-test/t/have_ndbcluster_basic.test
--- a/mysql-test/t/have_openssl_basic.test
+++ b/mysql-test/t/have_openssl_basic.test
--- a/mysql-test/t/have_partitioning_basic.test
+++ b/mysql-test/t/have_partitioning_basic.test
--- a/mysql-test/t/have_query_cache_basic.test
+++ b/mysql-test/t/have_query_cache_basic.test
--- a/mysql-test/t/have_rtree_keys_basic.test
+++ b/mysql-test/t/have_rtree_keys_basic.test
--- a/mysql-test/t/have_ssl_basic.test
+++ b/mysql-test/t/have_ssl_basic.test
--- a/mysql-test/t/have_symlink_basic.test
+++ b/mysql-test/t/have_symlink_basic.test
--- a/mysql-test/t/hostname_basic.test
+++ b/mysql-test/t/hostname_basic.test
--- a/mysql-test/t/identity_basic.test
+++ b/mysql-test/t/identity_basic.test
--- a/mysql-test/t/identity_func-master.opt
+++ b/mysql-test/t/identity_func-master.opt
--- a/mysql-test/t/identity_func.test
+++ b/mysql-test/t/identity_func.test
--- a/mysql-test/t/init_connect_basic.test
+++ b/mysql-test/t/init_connect_basic.test
--- a/mysql-test/t/init_slave_basic.test
+++ b/mysql-test/t/init_slave_basic.test
--- a/mysql-test/t/innodb_additional_mem_pool_size_basic.test
+++ b/mysql-test/t/innodb_additional_mem_pool_size_basic.test
--- a/mysql-test/t/innodb_autoextend_increment_basic.test
+++ b/mysql-test/t/innodb_autoextend_increment_basic.test
--- a/mysql-test/t/innodb_autoinc_lock_mode_basic.test
+++ b/mysql-test/t/innodb_autoinc_lock_mode_basic.test
--- a/mysql-test/t/innodb_autoinc_lock_mode_func-master.opt
+++ b/mysql-test/t/innodb_autoinc_lock_mode_func-master.opt
--- a/mysql-test/t/innodb_autoinc_lock_mode_func.test
+++ b/mysql-test/t/innodb_autoinc_lock_mode_func.test
--- a/mysql-test/t/innodb_buffer_pool_size_basic.test
+++ b/mysql-test/t/innodb_buffer_pool_size_basic.test
--- a/mysql-test/t/innodb_checksums_basic.test
+++ b/mysql-test/t/innodb_checksums_basic.test
--- a/mysql-test/t/innodb_commit_concurrency_basic.test
+++ b/mysql-test/t/innodb_commit_concurrency_basic.test
--- a/mysql-test/t/innodb_data_file_path_basic.test
+++ b/mysql-test/t/innodb_data_file_path_basic.test
--- a/mysql-test/t/innodb_data_home_dir_basic.test
+++ b/mysql-test/t/innodb_data_home_dir_basic.test
--- a/mysql-test/t/innodb_doublewrite_basic.test
+++ b/mysql-test/t/innodb_doublewrite_basic.test
--- a/mysql-test/t/innodb_fast_shutdown_basic.test
+++ b/mysql-test/t/innodb_fast_shutdown_basic.test
--- a/mysql-test/t/innodb_file_io_threads_basic.test
+++ b/mysql-test/t/innodb_file_io_threads_basic.test
--- a/mysql-test/t/innodb_file_per_table_basic.test
+++ b/mysql-test/t/innodb_file_per_table_basic.test
--- a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
+++ b/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test
--- a/mysql-test/t/innodb_flush_method_basic.test
+++ b/mysql-test/t/innodb_flush_method_basic.test
--- a/mysql-test/t/innodb_force_recovery_basic.test
+++ b/mysql-test/t/innodb_force_recovery_basic.test
--- a/mysql-test/t/innodb_lock_wait_timeout_basic.test
+++ b/mysql-test/t/innodb_lock_wait_timeout_basic.test
--- a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
+++ b/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test
--- a/mysql-test/t/innodb_log_buffer_size_basic.test
+++ b/mysql-test/t/innodb_log_buffer_size_basic.test
--- a/mysql-test/t/innodb_log_file_size_basic.test
+++ b/mysql-test/t/innodb_log_file_size_basic.test
--- a/mysql-test/t/innodb_log_files_in_group_basic.test
+++ b/mysql-test/t/innodb_log_files_in_group_basic.test
--- a/mysql-test/t/innodb_log_group_home_dir_basic.test
+++ b/mysql-test/t/innodb_log_group_home_dir_basic.test
--- a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
+++ b/mysql-test/t/innodb_max_dirty_pages_pct_basic.test
--- a/mysql-test/t/innodb_max_dirty_pages_pct_func.test
+++ b/mysql-test/t/innodb_max_dirty_pages_pct_func.test
--- a/mysql-test/t/innodb_mirrored_log_groups_basic.test
+++ b/mysql-test/t/innodb_mirrored_log_groups_basic.test
--- a/mysql-test/t/innodb_open_files_basic.test
+++ b/mysql-test/t/innodb_open_files_basic.test
--- a/mysql-test/t/innodb_rollback_on_timeout_basic.test
+++ b/mysql-test/t/innodb_rollback_on_timeout_basic.test
--- a/mysql-test/t/innodb_support_xa_basic.test
+++ b/mysql-test/t/innodb_support_xa_basic.test
--- a/mysql-test/t/innodb_support_xa_func.test
+++ b/mysql-test/t/innodb_support_xa_func.test
--- a/mysql-test/t/innodb_table_locks_basic.test
+++ b/mysql-test/t/innodb_table_locks_basic.test
--- a/mysql-test/t/innodb_table_locks_func.test
+++ b/mysql-test/t/innodb_table_locks_func.test
--- a/mysql-test/t/innodb_thread_concurrency_basic.test
+++ b/mysql-test/t/innodb_thread_concurrency_basic.test
--- a/mysql-test/t/insert_id_basic.test
+++ b/mysql-test/t/insert_id_basic.test
--- a/mysql-test/t/insert_id_func.test
+++ b/mysql-test/t/insert_id_func.test
--- a/mysql-test/t/interactive_timeout_basic.test
+++ b/mysql-test/t/interactive_timeout_basic.test
--- a/mysql-test/t/interactive_timeout_func.test
+++ b/mysql-test/t/interactive_timeout_func.test
--- a/mysql-test/t/keep_files_on_create_basic.test
+++ b/mysql-test/t/keep_files_on_create_basic.test
--- a/mysql-test/t/key_buffer_size_func.test
+++ b/mysql-test/t/key_buffer_size_func.test
--- a/mysql-test/t/last_insert_id_func-master.opt
+++ b/mysql-test/t/last_insert_id_func-master.opt
--- a/mysql-test/t/last_insert_id_func.test
+++ b/mysql-test/t/last_insert_id_func.test
--- a/mysql-test/t/lc_time_names_basic.test
+++ b/mysql-test/t/lc_time_names_basic.test
--- a/mysql-test/t/lc_time_names_func.test
+++ b/mysql-test/t/lc_time_names_func.test
--- a/mysql-test/t/license_basic.test
+++ b/mysql-test/t/license_basic.test
--- a/mysql-test/t/local_infile_basic.test
+++ b/mysql-test/t/local_infile_basic.test
--- a/mysql-test/t/local_infile_func.test
+++ b/mysql-test/t/local_infile_func.test
--- a/mysql-test/t/log_basic.test
+++ b/mysql-test/t/log_basic.test
--- a/mysql-test/t/log_bin_trust_function_creators_basic.test
+++ b/mysql-test/t/log_bin_trust_function_creators_basic.test
--- a/mysql-test/t/log_bin_trust_function_creators_func-master.opt
+++ b/mysql-test/t/log_bin_trust_function_creators_func-master.opt
--- a/mysql-test/t/log_bin_trust_function_creators_func.test
+++ b/mysql-test/t/log_bin_trust_function_creators_func.test
--- a/mysql-test/t/log_bin_trust_routine_creators_basic.test
+++ b/mysql-test/t/log_bin_trust_routine_creators_basic.test
--- a/mysql-test/t/log_output_basic.test
+++ b/mysql-test/t/log_output_basic.test
--- a/mysql-test/t/log_output_func.test
+++ b/mysql-test/t/log_output_func.test
--- a/mysql-test/t/log_queries_not_using_indexes_basic.test
+++ b/mysql-test/t/log_queries_not_using_indexes_basic.test
--- a/mysql-test/t/long_query_time_basic.test
+++ b/mysql-test/t/long_query_time_basic.test
--- a/mysql-test/t/low_priority_updates_basic.test
+++ b/mysql-test/t/low_priority_updates_basic.test
--- a/mysql-test/t/max_allowed_packet_basic.test
+++ b/mysql-test/t/max_allowed_packet_basic.test
--- a/mysql-test/t/max_allowed_packet_func.test
+++ b/mysql-test/t/max_allowed_packet_func.test
--- a/mysql-test/t/max_binlog_cache_size_func-master.opt
+++ b/mysql-test/t/max_binlog_cache_size_func-master.opt
--- a/mysql-test/t/max_binlog_size_basic.test
+++ b/mysql-test/t/max_binlog_size_basic.test
--- a/mysql-test/t/max_connections_basic.test
+++ b/mysql-test/t/max_connections_basic.test
--- a/mysql-test/t/max_delayed_threads_basic.test
+++ b/mysql-test/t/max_delayed_threads_basic.test
--- a/mysql-test/t/max_error_count_basic.test
+++ b/mysql-test/t/max_error_count_basic.test
--- a/mysql-test/t/max_insert_delayed_threads_basic.test
+++ b/mysql-test/t/max_insert_delayed_threads_basic.test
--- a/mysql-test/t/max_join_size_func.test
+++ b/mysql-test/t/max_join_size_func.test
--- a/mysql-test/t/max_length_for_sort_data_basic.test
+++ b/mysql-test/t/max_length_for_sort_data_basic.test
--- a/mysql-test/t/max_prepared_stmt_count_basic.test
+++ b/mysql-test/t/max_prepared_stmt_count_basic.test
--- a/mysql-test/t/max_prepared_stmt_count_func.test
+++ b/mysql-test/t/max_prepared_stmt_count_func.test
--- a/mysql-test/t/max_relay_log_size_basic.test
+++ b/mysql-test/t/max_relay_log_size_basic.test
--- a/mysql-test/t/max_seeks_for_key_func.test
+++ b/mysql-test/t/max_seeks_for_key_func.test
--- a/mysql-test/t/max_sort_length_basic.test
+++ b/mysql-test/t/max_sort_length_basic.test
--- a/mysql-test/t/max_sort_length_func.test
+++ b/mysql-test/t/max_sort_length_func.test
--- a/mysql-test/t/max_sp_recursion_depth_basic.test
+++ b/mysql-test/t/max_sp_recursion_depth_basic.test
--- a/mysql-test/t/max_sp_recursion_depth_func.test
+++ b/mysql-test/t/max_sp_recursion_depth_func.test
--- a/mysql-test/t/max_user_connections_basic.test
+++ b/mysql-test/t/max_user_connections_basic.test
--- a/mysql-test/t/max_user_connections_func.test
+++ b/mysql-test/t/max_user_connections_func.test
--- a/mysql-test/t/myisam_data_pointer_size_basic.test
+++ b/mysql-test/t/myisam_data_pointer_size_basic.test
--- a/mysql-test/t/myisam_data_pointer_size_func.test
+++ b/mysql-test/t/myisam_data_pointer_size_func.test
--- a/mysql-test/t/myisam_stats_method_basic.test
+++ b/mysql-test/t/myisam_stats_method_basic.test
--- a/mysql-test/t/myisam_stats_method_func.test
+++ b/mysql-test/t/myisam_stats_method_func.test
--- a/mysql-test/t/myisam_use_mmap_basic.test
+++ b/mysql-test/t/myisam_use_mmap_basic.test
--- a/mysql-test/t/ndb_log_update_as_write_basic.test
+++ b/mysql-test/t/ndb_log_update_as_write_basic.test
--- a/mysql-test/t/ndb_log_updated_only_basic.test
+++ b/mysql-test/t/ndb_log_updated_only_basic.test
--- a/mysql-test/t/net_buffer_length_basic.test
+++ b/mysql-test/t/net_buffer_length_basic.test
--- a/mysql-test/t/net_read_timeout_basic.test
+++ b/mysql-test/t/net_read_timeout_basic.test
--- a/mysql-test/t/net_write_timeout_basic.test
+++ b/mysql-test/t/net_write_timeout_basic.test
--- a/mysql-test/t/new_basic.test
+++ b/mysql-test/t/new_basic.test
--- a/mysql-test/t/old_passwords_basic.test
+++ b/mysql-test/t/old_passwords_basic.test
--- a/mysql-test/t/old_passwords_func.test
+++ b/mysql-test/t/old_passwords_func.test
--- a/mysql-test/t/optimizer_prune_level_basic.test
+++ b/mysql-test/t/optimizer_prune_level_basic.test
--- a/mysql-test/t/optimizer_search_depth_basic.test
+++ b/mysql-test/t/optimizer_search_depth_basic.test
--- a/mysql-test/t/preload_buffer_size_basic.test
+++ b/mysql-test/t/preload_buffer_size_basic.test
--- a/mysql-test/t/query_cache_limit_func.test
+++ b/mysql-test/t/query_cache_limit_func.test
--- a/mysql-test/t/query_cache_type_basic.test
+++ b/mysql-test/t/query_cache_type_basic.test
--- a/mysql-test/t/query_cache_type_func.test
+++ b/mysql-test/t/query_cache_type_func.test
--- a/mysql-test/t/query_cache_wlock_invalidate_basic.test
+++ b/mysql-test/t/query_cache_wlock_invalidate_basic.test
--- a/mysql-test/t/query_cache_wlock_invalidate_func.test
+++ b/mysql-test/t/query_cache_wlock_invalidate_func.test
--- a/mysql-test/t/query_prealloc_size_func.test
+++ b/mysql-test/t/query_prealloc_size_func.test
--- a/mysql-test/t/read_buffer_size_basic.test
+++ b/mysql-test/t/read_buffer_size_basic.test
--- a/mysql-test/t/read_only_basic.test
+++ b/mysql-test/t/read_only_basic.test
--- a/mysql-test/t/read_only_func.test
+++ b/mysql-test/t/read_only_func.test
--- a/mysql-test/t/read_rnd_buffer_size_basic.test
+++ b/mysql-test/t/read_rnd_buffer_size_basic.test
--- a/mysql-test/t/relay_log_purge_basic.test
+++ b/mysql-test/t/relay_log_purge_basic.test
--- a/mysql-test/t/rpl_init_slave_func-slave.opt
+++ b/mysql-test/t/rpl_init_slave_func-slave.opt
--- a/mysql-test/t/rpl_init_slave_func.test
+++ b/mysql-test/t/rpl_init_slave_func.test
--- a/mysql-test/t/rpl_max_binlog_size_func-master.opt
+++ b/mysql-test/t/rpl_max_binlog_size_func-master.opt
--- a/mysql-test/t/rpl_max_binlog_size_func.test
+++ b/mysql-test/t/rpl_max_binlog_size_func.test
@@ -32,6 +32,7 @@ dec $a;
 --echo 'mylog.000002 exists'
+DROP TABLE t1;
 ###############################################################################
 # End of functionality testing for max_binlog_size                            #
 ###############################################################################

--- a/mysql-test/t/secure_auth_basic.test
+++ b/mysql-test/t/secure_auth_basic.test
--- a/mysql-test/t/secure_auth_func-master.opt
+++ b/mysql-test/t/secure_auth_func-master.opt
--- a/mysql-test/t/secure_auth_func.test
+++ b/mysql-test/t/secure_auth_func.test
--- a/mysql-test/t/slave_allow_batching_basic.test
+++ b/mysql-test/t/slave_allow_batching_basic.test
--- a/mysql-test/t/slave_compressed_protocol_basic.test
+++ b/mysql-test/t/slave_compressed_protocol_basic.test
--- a/mysql-test/t/slave_exec_mode_basic.test
+++ b/mysql-test/t/slave_exec_mode_basic.test
--- a/mysql-test/t/slave_net_timeout_basic.test
+++ b/mysql-test/t/slave_net_timeout_basic.test
--- a/mysql-test/t/slow_launch_time_basic.test
+++ b/mysql-test/t/slow_launch_time_basic.test
--- a/mysql-test/t/slow_launch_time_func.test
+++ b/mysql-test/t/slow_launch_time_func.test
--- a/mysql-test/t/slow_query_log_basic.test
+++ b/mysql-test/t/slow_query_log_basic.test
--- a/mysql-test/t/slow_query_log_file_basic-master.opt
+++ b/mysql-test/t/slow_query_log_file_basic-master.opt
--- a/mysql-test/t/slow_query_log_file_basic.test
+++ b/mysql-test/t/slow_query_log_file_basic.test
--- a/mysql-test/t/slow_query_log_file_func-master.opt
+++ b/mysql-test/t/slow_query_log_file_func-master.opt
--- a/mysql-test/t/slow_query_log_file_func.test
+++ b/mysql-test/t/slow_query_log_file_func.test
--- a/mysql-test/t/slow_query_log_func.test
+++ b/mysql-test/t/slow_query_log_func.test
--- a/mysql-test/t/sql_auto_is_null_basic.test
+++ b/mysql-test/t/sql_auto_is_null_basic.test
--- a/mysql-test/t/sql_big_selects_basic.test
+++ b/mysql-test/t/sql_big_selects_basic.test
--- a/mysql-test/t/sql_big_selects_func.test
+++ b/mysql-test/t/sql_big_selects_func.test
--- a/mysql-test/t/sql_big_tables_basic.test
+++ b/mysql-test/t/sql_big_tables_basic.test
--- a/mysql-test/t/sql_big_tables_func.test
+++ b/mysql-test/t/sql_big_tables_func.test
--- a/mysql-test/t/sql_buffer_result_basic.test
+++ b/mysql-test/t/sql_buffer_result_basic.test
--- a/mysql-test/t/sql_buffer_result_func.test
+++ b/mysql-test/t/sql_buffer_result_func.test
--- a/mysql-test/t/sql_log_bin_basic.test
+++ b/mysql-test/t/sql_log_bin_basic.test
--- a/mysql-test/t/sql_log_off_basic.test
+++ b/mysql-test/t/sql_log_off_basic.test
--- a/mysql-test/t/sql_log_off_func.test
+++ b/mysql-test/t/sql_log_off_func.test
--- a/mysql-test/t/sql_low_priority_updates_basic.test
+++ b/mysql-test/t/sql_low_priority_updates_basic.test
--- a/mysql-test/t/sql_low_priority_updates_func.test
+++ b/mysql-test/t/sql_low_priority_updates_func.test
--- a/mysql-test/t/sql_max_join_size_func.test
+++ b/mysql-test/t/sql_max_join_size_func.test
--- a/mysql-test/t/sql_mode_basic.test
+++ b/mysql-test/t/sql_mode_basic.test
--- a/mysql-test/t/sql_mode_func.test
+++ b/mysql-test/t/sql_mode_func.test
--- a/mysql-test/t/sql_notes_basic.test
+++ b/mysql-test/t/sql_notes_basic.test
--- a/mysql-test/t/sql_notes_func.test
+++ b/mysql-test/t/sql_notes_func.test
--- a/mysql-test/t/sql_quote_show_create_basic.test
+++ b/mysql-test/t/sql_quote_show_create_basic.test
--- a/mysql-test/t/sql_quote_show_create_func.test
+++ b/mysql-test/t/sql_quote_show_create_func.test
--- a/mysql-test/t/sql_safe_updates_basic.test
+++ b/mysql-test/t/sql_safe_updates_basic.test
--- a/mysql-test/t/sql_safe_updates_func.test
+++ b/mysql-test/t/sql_safe_updates_func.test
--- a/mysql-test/t/sql_select_limit_func.test
+++ b/mysql-test/t/sql_select_limit_func.test
--- a/mysql-test/t/sql_slave_skip_counter_basic.test
+++ b/mysql-test/t/sql_slave_skip_counter_basic.test
--- a/mysql-test/t/sql_warnings_basic.test
+++ b/mysql-test/t/sql_warnings_basic.test
--- a/mysql-test/t/sql_warnings_func.test
+++ b/mysql-test/t/sql_warnings_func.test
--- a/mysql-test/t/ssl_ca_basic.test
+++ b/mysql-test/t/ssl_ca_basic.test
--- a/mysql-test/t/ssl_capath_basic.test
+++ b/mysql-test/t/ssl_capath_basic.test
--- a/mysql-test/t/ssl_cert_basic.test
+++ b/mysql-test/t/ssl_cert_basic.test
--- a/mysql-test/t/ssl_cipher_basic.test
+++ b/mysql-test/t/ssl_cipher_basic.test
--- a/mysql-test/t/ssl_key_basic.test
+++ b/mysql-test/t/ssl_key_basic.test
--- a/mysql-test/t/storage_engine_basic-master.opt
+++ b/mysql-test/t/storage_engine_basic-master.opt
--- a/mysql-test/t/storage_engine_basic.test
+++ b/mysql-test/t/storage_engine_basic.test
--- a/mysql-test/t/sync_frm_basic.test
+++ b/mysql-test/t/sync_frm_basic.test
--- a/mysql-test/t/system_time_zone_basic.test
+++ b/mysql-test/t/system_time_zone_basic.test
--- a/mysql-test/t/table_definition_cache_basic.test
+++ b/mysql-test/t/table_definition_cache_basic.test
--- a/mysql-test/t/table_lock_wait_timeout_basic.test
+++ b/mysql-test/t/table_lock_wait_timeout_basic.test
--- a/mysql-test/t/table_open_cache_basic.test
+++ b/mysql-test/t/table_open_cache_basic.test
--- a/mysql-test/t/thread_cache_size_func.test
+++ b/mysql-test/t/thread_cache_size_func.test
--- a/mysql-test/t/thread_handling_basic.test
+++ b/mysql-test/t/thread_handling_basic.test
--- a/mysql-test/t/time_zone_basic.test
+++ b/mysql-test/t/time_zone_basic.test
--- a/mysql-test/t/time_zone_func.test
+++ b/mysql-test/t/time_zone_func.test
--- a/mysql-test/t/timed_mutexes_basic.test
+++ b/mysql-test/t/timed_mutexes_basic.test
--- a/mysql-test/t/timestamp_func.test
+++ b/mysql-test/t/timestamp_func.test
--- a/mysql-test/t/timestamp_sysdate_is_now_func-master.opt
+++ b/mysql-test/t/timestamp_sysdate_is_now_func-master.opt
--- a/mysql-test/t/timestamp_sysdate_is_now_func.test
+++ b/mysql-test/t/timestamp_sysdate_is_now_func.test
--- a/mysql-test/t/tmpdir_basic.test
+++ b/mysql-test/t/tmpdir_basic.test
--- a/mysql-test/t/tx_isolation_basic.test
+++ b/mysql-test/t/tx_isolation_basic.test
--- a/mysql-test/t/tx_isolation_func-master.opt
+++ b/mysql-test/t/tx_isolation_func-master.opt
--- a/mysql-test/t/tx_isolation_func.test
+++ b/mysql-test/t/tx_isolation_func.test
--- a/mysql-test/t/unique_checks_basic.test
+++ b/mysql-test/t/unique_checks_basic.test
--- a/mysql-test/t/updatable_views_with_limit_basic.test
+++ b/mysql-test/t/updatable_views_with_limit_basic.test
--- a/mysql-test/t/updatable_views_with_limit_func.test
+++ b/mysql-test/t/updatable_views_with_limit_func.test
--- a/mysql-test/t/version_basic.test
+++ b/mysql-test/t/version_basic.test
--- a/mysql-test/t/version_comment_basic.test
+++ b/mysql-test/t/version_comment_basic.test
--- a/mysql-test/t/version_compile_machine_basic.test
+++ b/mysql-test/t/version_compile_machine_basic.test
--- a/mysql-test/t/version_compile_os_basic.test
+++ b/mysql-test/t/version_compile_os_basic.test
--- a/mysql-test/t/wait_timeout_func.test
+++ b/mysql-test/t/wait_timeout_func.test
--- a/mysql-test/t/warning_count_basic.test
+++ b/mysql-test/t/warning_count_basic.test