From 5dc90abc510baf31bbdf8a4eeceb9818a1d115f0 Mon Sep 17 00:00:00 2001 From: Horst Hunger Date: Fri, 12 Dec 2008 21:48:17 +0100 Subject: [PATCH 1/2] Took the system variable tests out of the main test suite and put them into "sys_vars". --- .../sys_vars/inc}/charset_basic.inc | 0 .../sys_vars/inc}/collation_basic.inc | 0 .../{ => suite/sys_vars}/r/auto_commit_basic.result | 0 .../r/auto_increment_increment_basic.result | 0 .../r/auto_increment_increment_func.result | 0 .../sys_vars}/r/auto_increment_offset_basic.result | 0 .../sys_vars}/r/auto_increment_offset_func.result | 0 .../{ => suite/sys_vars}/r/autocommit_func.result | 0 .../r/automatic_sp_privileges_basic.result | 0 .../sys_vars}/r/automatic_sp_privileges_func.result | 0 .../{ => suite/sys_vars}/r/basedir_basic.result | 0 .../{ => suite/sys_vars}/r/big_tables_basic.result | 0 .../sys_vars}/r/binlog_format_basic.result | 0 .../sys_vars}/r/character_set_client_basic.result | 0 .../sys_vars}/r/character_set_client_func.result | 0 .../r/character_set_connection_basic.result | 0 .../r/character_set_connection_func.result | 0 .../sys_vars}/r/character_set_database_basic.result | 0 .../sys_vars}/r/character_set_database_func.result | 0 .../r/character_set_filesystem_basic.result | 0 .../sys_vars}/r/character_set_results_basic.result | Bin .../sys_vars}/r/character_set_results_func.result | 0 .../sys_vars}/r/character_set_server_basic.result | 0 .../sys_vars}/r/character_set_server_func.result | 0 .../sys_vars}/r/character_set_system_basic.result | 0 .../sys_vars}/r/collation_connection_basic.result | 0 .../sys_vars}/r/collation_connection_func.result | 0 .../sys_vars}/r/collation_database_basic.result | 0 .../sys_vars}/r/collation_database_func.result | 0 .../sys_vars}/r/collation_server_basic.result | 0 .../sys_vars}/r/collation_server_func.result | 0 .../sys_vars}/r/completion_type_basic.result | 0 .../sys_vars}/r/completion_type_func.result | 0 .../sys_vars}/r/concurrent_insert_basic.result | 0 .../sys_vars}/r/concurrent_insert_func.result | 0 .../sys_vars}/r/connect_timeout_basic.result | 0 .../{ => suite/sys_vars}/r/datadir_basic.result | 0 .../sys_vars}/r/default_week_format_basic.result | 0 .../sys_vars}/r/default_week_format_func.result | 0 .../sys_vars}/r/delay_key_write_basic.result | 0 .../sys_vars}/r/delay_key_write_func.result | 0 .../sys_vars}/r/delayed_insert_limit_func.result | 0 .../sys_vars}/r/delayed_insert_timeout_basic.result | 0 .../r/div_precision_increment_basic.result | 0 .../sys_vars}/r/div_precision_increment_func.result | 0 .../r/engine_condition_pushdown_basic.result | 0 .../{ => suite/sys_vars}/r/error_count_basic.result | 0 .../sys_vars}/r/event_scheduler_basic.result | 0 .../sys_vars}/r/event_scheduler_func.result | 0 .../sys_vars}/r/expire_logs_days_basic.result | 0 .../{ => suite/sys_vars}/r/flush_basic.result | 0 .../sys_vars}/r/foreign_key_checks_basic.result | 0 .../sys_vars}/r/foreign_key_checks_func.result | 0 .../sys_vars}/r/ft_boolean_syntax_basic.result | 0 .../sys_vars}/r/ft_boolean_syntax_func.result | 0 .../{ => suite/sys_vars}/r/general_log_basic.result | 0 .../sys_vars}/r/general_log_file_basic.result | 0 .../sys_vars}/r/general_log_file_func.result | 0 .../{ => suite/sys_vars}/r/general_log_func.result | 0 .../sys_vars}/r/group_concat_max_len_basic.result | 0 .../sys_vars}/r/group_concat_max_len_func.result | 0 .../sys_vars}/r/have_compress_basic.result | 0 .../{ => suite/sys_vars}/r/have_crypt_basic.result | 0 .../{ => suite/sys_vars}/r/have_csv_basic.result | 0 .../sys_vars}/r/have_dynamic_loading_basic.result | 0 .../sys_vars}/r/have_geometry_basic.result | 0 .../{ => suite/sys_vars}/r/have_innodb_basic.result | 0 .../sys_vars}/r/have_ndbcluster_basic.result | 0 .../sys_vars}/r/have_openssl_basic.result | 0 .../sys_vars}/r/have_partitioning_basic.result | 0 .../sys_vars}/r/have_query_cache_basic.result | 0 .../sys_vars}/r/have_rtree_keys_basic.result | 0 .../{ => suite/sys_vars}/r/have_ssl_basic.result | 0 .../sys_vars}/r/have_symlink_basic.result | 0 .../{ => suite/sys_vars}/r/hostname_basic.result | 0 .../{ => suite/sys_vars}/r/identity_basic.result | 0 .../{ => suite/sys_vars}/r/identity_func.result | 0 .../sys_vars}/r/init_connect_basic.result | 0 .../{ => suite/sys_vars}/r/init_slave_basic.result | 0 .../r/innodb_additional_mem_pool_size_basic.result | 0 .../r/innodb_autoextend_increment_basic.result | 0 .../r/innodb_autoinc_lock_mode_basic.result | 0 .../r/innodb_autoinc_lock_mode_func.result | 0 .../r/innodb_buffer_pool_size_basic.result | 0 .../sys_vars}/r/innodb_checksums_basic.result | 0 .../r/innodb_commit_concurrency_basic.result | 0 .../sys_vars}/r/innodb_data_file_path_basic.result | 0 .../sys_vars}/r/innodb_data_home_dir_basic.result | 0 .../sys_vars}/r/innodb_doublewrite_basic.result | 0 .../sys_vars}/r/innodb_fast_shutdown_basic.result | 0 .../sys_vars}/r/innodb_file_io_threads_basic.result | 0 .../sys_vars}/r/innodb_file_per_table_basic.result | 0 .../r/innodb_flush_log_at_trx_commit_basic.result | 0 .../sys_vars}/r/innodb_flush_method_basic.result | 0 .../sys_vars}/r/innodb_force_recovery_basic.result | 0 .../r/innodb_lock_wait_timeout_basic.result | 0 .../r/innodb_locks_unsafe_for_binlog_basic.result | 0 .../sys_vars}/r/innodb_log_buffer_size_basic.result | 0 .../sys_vars}/r/innodb_log_file_size_basic.result | 0 .../r/innodb_log_files_in_group_basic.result | 0 .../r/innodb_log_group_home_dir_basic.result | 0 .../r/innodb_max_dirty_pages_pct_basic.result | 0 .../r/innodb_max_dirty_pages_pct_func.result | 0 .../r/innodb_mirrored_log_groups_basic.result | 0 .../sys_vars}/r/innodb_open_files_basic.result | 0 .../r/innodb_rollback_on_timeout_basic.result | 0 .../sys_vars}/r/innodb_support_xa_basic.result | 0 .../sys_vars}/r/innodb_support_xa_func.result | 0 .../sys_vars}/r/innodb_table_locks_basic.result | 0 .../sys_vars}/r/innodb_table_locks_func.result | 0 .../r/innodb_thread_concurrency_basic.result | 0 .../r/innodb_thread_sleep_delay_basic.result | 0 .../{ => suite/sys_vars}/r/insert_id_basic.result | 0 .../{ => suite/sys_vars}/r/insert_id_func.result | 0 .../sys_vars}/r/interactive_timeout_basic.result | 0 .../sys_vars}/r/interactive_timeout_func.result | 0 .../sys_vars}/r/keep_files_on_create_basic.result | 0 .../sys_vars}/r/key_buffer_size_func.result | 0 .../sys_vars}/r/last_insert_id_func.result | 0 .../sys_vars}/r/lc_time_names_basic.result | 0 .../sys_vars}/r/lc_time_names_func.result | 0 .../{ => suite/sys_vars}/r/license_basic.result | 0 .../sys_vars}/r/local_infile_basic.result | 0 .../{ => suite/sys_vars}/r/local_infile_func.result | 0 mysql-test/{ => suite/sys_vars}/r/log_basic.result | 0 .../r/log_bin_trust_function_creators_basic.result | 0 .../r/log_bin_trust_function_creators_func.result | 0 .../r/log_bin_trust_routine_creators_basic.result | 0 .../{ => suite/sys_vars}/r/log_output_basic.result | 0 .../{ => suite/sys_vars}/r/log_output_func.result | 0 .../r/log_queries_not_using_indexes_basic.result | 0 .../sys_vars}/r/long_query_time_basic.result | 0 .../sys_vars}/r/low_priority_updates_basic.result | 0 .../sys_vars}/r/max_allowed_packet_basic.result | 0 .../sys_vars}/r/max_allowed_packet_func.result | 0 .../sys_vars}/r/max_binlog_cache_size_func.result | 0 .../sys_vars}/r/max_binlog_size_basic.result | 0 .../sys_vars}/r/max_connections_basic.result | 0 .../sys_vars}/r/max_delayed_threads_basic.result | 0 .../sys_vars}/r/max_error_count_basic.result | 0 .../r/max_insert_delayed_threads_basic.result | 0 .../sys_vars}/r/max_join_size_func.result | 0 .../r/max_length_for_sort_data_basic.result | 0 .../r/max_prepared_stmt_count_basic.result | 0 .../sys_vars}/r/max_prepared_stmt_count_func.result | 0 .../sys_vars}/r/max_relay_log_size_basic.result | 0 .../sys_vars}/r/max_seeks_for_key_func.result | 0 .../sys_vars}/r/max_sort_length_basic.result | 0 .../sys_vars}/r/max_sort_length_func.result | 0 .../sys_vars}/r/max_sp_recursion_depth_basic.result | 0 .../sys_vars}/r/max_sp_recursion_depth_func.result | 0 .../sys_vars}/r/max_user_connections_basic.result | 0 .../sys_vars}/r/max_user_connections_func.result | 0 .../r/myisam_data_pointer_size_basic.result | 0 .../r/myisam_data_pointer_size_func.result | 0 .../r/myisam_sort_buffer_size_basic.result | 0 .../sys_vars}/r/myisam_stats_method_basic.result | 0 .../sys_vars}/r/myisam_stats_method_func.result | 0 .../sys_vars}/r/myisam_use_mmap_basic.result | 0 .../r/ndb_log_update_as_write_basic.result | 0 .../sys_vars}/r/ndb_log_updated_only_basic.result | 0 .../sys_vars}/r/net_buffer_length_basic.result | 0 .../sys_vars}/r/net_read_timeout_basic.result | 0 .../sys_vars}/r/net_write_timeout_basic.result | 0 mysql-test/{ => suite/sys_vars}/r/new_basic.result | 0 .../sys_vars}/r/old_passwords_basic.result | 0 .../sys_vars}/r/old_passwords_func.result | 0 .../sys_vars}/r/optimizer_prune_level_basic.result | 0 .../sys_vars}/r/optimizer_search_depth_basic.result | 0 .../sys_vars}/r/preload_buffer_size_basic.result | 0 .../sys_vars}/r/query_cache_limit_func.result | 0 .../sys_vars/r/query_cache_size_basic_32.result | 6 +++--- .../sys_vars}/r/query_cache_type_basic.result | 0 .../sys_vars}/r/query_cache_type_func.result | 0 .../r/query_cache_wlock_invalidate_basic.result | 0 .../r/query_cache_wlock_invalidate_func.result | 0 .../sys_vars}/r/query_prealloc_size_func.result | 0 .../sys_vars}/r/read_buffer_size_basic.result | 0 .../{ => suite/sys_vars}/r/read_only_basic.result | 0 .../{ => suite/sys_vars}/r/read_only_func.result | 0 .../sys_vars}/r/read_rnd_buffer_size_basic.result | 0 .../sys_vars}/r/relay_log_purge_basic.result | 0 .../sys_vars}/r/rpl_init_slave_func.result | 0 .../sys_vars}/r/rpl_max_binlog_size_func.result | 1 + .../{ => suite/sys_vars}/r/secure_auth_basic.result | 0 .../{ => suite/sys_vars}/r/secure_auth_func.result | 0 .../sys_vars}/r/slave_allow_batching_basic.result | 0 .../r/slave_compressed_protocol_basic.result | 0 .../sys_vars}/r/slave_exec_mode_basic.result | 0 .../sys_vars}/r/slave_net_timeout_basic.result | 0 .../sys_vars}/r/slow_launch_time_basic.result | 0 .../sys_vars}/r/slow_launch_time_func.result | 0 .../sys_vars}/r/slow_query_log_basic.result | 0 .../sys_vars}/r/slow_query_log_file_basic.result | 0 .../sys_vars}/r/slow_query_log_file_func.result | 0 .../sys_vars}/r/slow_query_log_func.result | 0 .../sys_vars}/r/sql_auto_is_null_basic.result | 0 .../sys_vars}/r/sql_big_selects_basic.result | 0 .../sys_vars}/r/sql_big_selects_func.result | 0 .../sys_vars}/r/sql_big_tables_basic.result | 0 .../sys_vars}/r/sql_big_tables_func.result | 0 .../sys_vars}/r/sql_buffer_result_basic.result | 0 .../sys_vars}/r/sql_buffer_result_func.result | 0 .../{ => suite/sys_vars}/r/sql_log_bin_basic.result | 0 .../{ => suite/sys_vars}/r/sql_log_off_basic.result | 0 .../{ => suite/sys_vars}/r/sql_log_off_func.result | 0 .../r/sql_low_priority_updates_basic.result | 0 .../r/sql_low_priority_updates_func.result | 0 .../sys_vars}/r/sql_max_join_size_func.result | 0 .../{ => suite/sys_vars}/r/sql_mode_basic.result | 0 .../{ => suite/sys_vars}/r/sql_mode_func.result | 0 .../{ => suite/sys_vars}/r/sql_notes_basic.result | 0 .../{ => suite/sys_vars}/r/sql_notes_func.result | 0 .../sys_vars}/r/sql_quote_show_create_basic.result | 0 .../sys_vars}/r/sql_quote_show_create_func.result | 0 .../sys_vars}/r/sql_safe_updates_basic.result | 0 .../sys_vars}/r/sql_safe_updates_func.result | 0 .../sys_vars}/r/sql_select_limit_func.result | 0 .../sys_vars}/r/sql_slave_skip_counter_basic.result | 0 .../sys_vars}/r/sql_warnings_basic.result | 0 .../{ => suite/sys_vars}/r/sql_warnings_func.result | 0 .../{ => suite/sys_vars}/r/ssl_ca_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_capath_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_cert_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_cipher_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_key_basic.result | 0 .../sys_vars}/r/storage_engine_basic.result | 0 .../{ => suite/sys_vars}/r/sync_frm_basic.result | 0 .../sys_vars}/r/system_time_zone_basic.result | 0 .../sys_vars}/r/table_definition_cache_basic.result | 0 .../r/table_lock_wait_timeout_basic.result | 0 .../sys_vars}/r/table_open_cache_basic.result | 0 .../sys_vars}/r/thread_cache_size_func.result | 0 .../sys_vars}/r/thread_handling_basic.result | 0 .../{ => suite/sys_vars}/r/time_zone_basic.result | 0 .../{ => suite/sys_vars}/r/time_zone_func.result | 0 .../sys_vars}/r/timed_mutexes_basic.result | 0 .../{ => suite/sys_vars}/r/timestamp_func.result | 0 .../r/timestamp_sysdate_is_now_func.result | 0 .../{ => suite/sys_vars}/r/tmpdir_basic.result | 0 .../sys_vars}/r/tx_isolation_basic.result | 0 .../{ => suite/sys_vars}/r/tx_isolation_func.result | 0 .../sys_vars}/r/unique_checks_basic.result | 0 .../r/updatable_views_with_limit_basic.result | 0 .../r/updatable_views_with_limit_func.result | 0 .../{ => suite/sys_vars}/r/version_basic.result | 0 .../sys_vars}/r/version_comment_basic.result | 0 .../r/version_compile_machine_basic.result | 0 .../sys_vars}/r/version_compile_os_basic.result | 0 .../{ => suite/sys_vars}/r/wait_timeout_func.result | 0 .../sys_vars}/r/warning_count_basic.result | 0 .../{ => suite/sys_vars}/t/auto_commit_basic.test | 0 .../sys_vars}/t/auto_increment_increment_basic.test | 0 .../sys_vars}/t/auto_increment_increment_func.test | 0 .../sys_vars}/t/auto_increment_offset_basic.test | 0 .../sys_vars}/t/auto_increment_offset_func.test | 0 .../sys_vars}/t/autocommit_func-master.opt | 0 .../{ => suite/sys_vars}/t/autocommit_func.test | 0 .../sys_vars}/t/automatic_sp_privileges_basic.test | 0 .../sys_vars}/t/automatic_sp_privileges_func.test | 0 .../{ => suite/sys_vars}/t/basedir_basic.test | 0 .../{ => suite/sys_vars}/t/big_tables_basic.test | 0 .../{ => suite/sys_vars}/t/binlog_format_basic.test | 0 .../sys_vars}/t/character_set_client_basic.test | 2 +- .../sys_vars}/t/character_set_client_func.test | 0 .../sys_vars}/t/character_set_connection_basic.test | 4 ++-- .../sys_vars}/t/character_set_connection_func.test | 0 .../sys_vars}/t/character_set_database_basic.test | 4 ++-- .../sys_vars}/t/character_set_database_func.test | 0 .../sys_vars}/t/character_set_filesystem_basic.test | 4 ++-- .../t/character_set_filesystem_func-master.opt | 0 .../sys_vars}/t/character_set_results_basic.test | 4 ++-- .../sys_vars}/t/character_set_results_func.test | 0 .../sys_vars}/t/character_set_server_basic.test | 4 ++-- .../sys_vars}/t/character_set_server_func.test | 0 .../sys_vars}/t/character_set_system_basic.test | 0 .../sys_vars}/t/collation_connection_basic.test | 4 ++-- .../sys_vars}/t/collation_connection_func.test | 0 .../sys_vars}/t/collation_database_basic.test | 4 ++-- .../sys_vars}/t/collation_database_func.test | 0 .../sys_vars}/t/collation_server_basic.test | 4 ++-- .../sys_vars}/t/collation_server_func.test | 0 .../sys_vars}/t/completion_type_basic.test | 0 .../sys_vars}/t/completion_type_func-master.opt | 0 .../sys_vars}/t/completion_type_func.test | 0 .../sys_vars}/t/concurrent_insert_basic.test | 0 .../sys_vars}/t/concurrent_insert_func.test | 0 .../sys_vars}/t/connect_timeout_basic.test | 0 .../{ => suite/sys_vars}/t/datadir_basic.test | 0 .../sys_vars}/t/default_week_format_basic.test | 0 .../sys_vars}/t/default_week_format_func.test | 0 .../sys_vars}/t/delay_key_write_basic.test | 0 .../sys_vars}/t/delay_key_write_func-master.opt | 0 .../sys_vars}/t/delay_key_write_func.test | 0 .../sys_vars}/t/delayed_insert_limit_func.test | 0 .../sys_vars}/t/delayed_insert_timeout_basic.test | 0 .../sys_vars}/t/div_precision_increment_basic.test | 0 .../sys_vars}/t/div_precision_increment_func.test | 0 .../t/engine_condition_pushdown_basic.test | 0 .../{ => suite/sys_vars}/t/error_count_basic.test | 0 .../sys_vars}/t/event_scheduler_basic.test | 0 .../sys_vars}/t/event_scheduler_func.test | 0 .../sys_vars}/t/expire_logs_days_basic.test | 0 mysql-test/{ => suite/sys_vars}/t/flush_basic.test | 0 .../sys_vars}/t/foreign_key_checks_basic.test | 0 .../sys_vars}/t/foreign_key_checks_func.test | 0 .../sys_vars}/t/ft_boolean_syntax_basic.test | 0 .../sys_vars}/t/ft_boolean_syntax_func.test | 0 .../{ => suite/sys_vars}/t/general_log_basic.test | 0 .../sys_vars}/t/general_log_file_basic-master.opt | 0 .../sys_vars}/t/general_log_file_basic.test | 0 .../sys_vars}/t/general_log_file_func-master.opt | 0 .../sys_vars}/t/general_log_file_func.test | 0 .../{ => suite/sys_vars}/t/general_log_func.test | 0 .../sys_vars}/t/group_concat_max_len_basic.test | 0 .../sys_vars}/t/group_concat_max_len_func.test | 0 .../{ => suite/sys_vars}/t/have_compress_basic.test | 0 .../{ => suite/sys_vars}/t/have_crypt_basic.test | 0 .../{ => suite/sys_vars}/t/have_csv_basic.test | 0 .../sys_vars}/t/have_dynamic_loading_basic.test | 0 .../{ => suite/sys_vars}/t/have_geometry_basic.test | 0 .../{ => suite/sys_vars}/t/have_innodb_basic.test | 0 .../sys_vars}/t/have_ndbcluster_basic.test | 0 .../{ => suite/sys_vars}/t/have_openssl_basic.test | 0 .../sys_vars}/t/have_partitioning_basic.test | 0 .../sys_vars}/t/have_query_cache_basic.test | 0 .../sys_vars}/t/have_rtree_keys_basic.test | 0 .../{ => suite/sys_vars}/t/have_ssl_basic.test | 0 .../{ => suite/sys_vars}/t/have_symlink_basic.test | 0 .../{ => suite/sys_vars}/t/hostname_basic.test | 0 .../{ => suite/sys_vars}/t/identity_basic.test | 0 .../{ => suite/sys_vars}/t/identity_func-master.opt | 0 .../{ => suite/sys_vars}/t/identity_func.test | 0 .../{ => suite/sys_vars}/t/init_connect_basic.test | 0 .../{ => suite/sys_vars}/t/init_slave_basic.test | 0 .../t/innodb_additional_mem_pool_size_basic.test | 0 .../t/innodb_autoextend_increment_basic.test | 0 .../sys_vars}/t/innodb_autoinc_lock_mode_basic.test | 0 .../t/innodb_autoinc_lock_mode_func-master.opt | 0 .../sys_vars}/t/innodb_autoinc_lock_mode_func.test | 0 .../sys_vars}/t/innodb_buffer_pool_size_basic.test | 0 .../sys_vars}/t/innodb_checksums_basic.test | 0 .../t/innodb_commit_concurrency_basic.test | 0 .../sys_vars}/t/innodb_data_file_path_basic.test | 0 .../sys_vars}/t/innodb_data_home_dir_basic.test | 0 .../sys_vars}/t/innodb_doublewrite_basic.test | 0 .../sys_vars}/t/innodb_fast_shutdown_basic.test | 0 .../sys_vars}/t/innodb_file_io_threads_basic.test | 0 .../sys_vars}/t/innodb_file_per_table_basic.test | 0 .../t/innodb_flush_log_at_trx_commit_basic.test | 0 .../sys_vars}/t/innodb_flush_method_basic.test | 0 .../sys_vars}/t/innodb_force_recovery_basic.test | 0 .../sys_vars}/t/innodb_lock_wait_timeout_basic.test | 0 .../t/innodb_locks_unsafe_for_binlog_basic.test | 0 .../sys_vars}/t/innodb_log_buffer_size_basic.test | 0 .../sys_vars}/t/innodb_log_file_size_basic.test | 0 .../t/innodb_log_files_in_group_basic.test | 0 .../t/innodb_log_group_home_dir_basic.test | 0 .../t/innodb_max_dirty_pages_pct_basic.test | 0 .../t/innodb_max_dirty_pages_pct_func.test | 0 .../t/innodb_mirrored_log_groups_basic.test | 0 .../sys_vars}/t/innodb_open_files_basic.test | 0 .../t/innodb_rollback_on_timeout_basic.test | 0 .../sys_vars}/t/innodb_support_xa_basic.test | 0 .../sys_vars}/t/innodb_support_xa_func.test | 0 .../sys_vars}/t/innodb_table_locks_basic.test | 0 .../sys_vars}/t/innodb_table_locks_func.test | 0 .../t/innodb_thread_concurrency_basic.test | 0 .../{ => suite/sys_vars}/t/insert_id_basic.test | 0 .../{ => suite/sys_vars}/t/insert_id_func.test | 0 .../sys_vars}/t/interactive_timeout_basic.test | 0 .../sys_vars}/t/interactive_timeout_func.test | 0 .../sys_vars}/t/keep_files_on_create_basic.test | 0 .../sys_vars}/t/key_buffer_size_func.test | 0 .../sys_vars}/t/last_insert_id_func-master.opt | 0 .../{ => suite/sys_vars}/t/last_insert_id_func.test | 0 .../{ => suite/sys_vars}/t/lc_time_names_basic.test | 0 .../{ => suite/sys_vars}/t/lc_time_names_func.test | 0 .../{ => suite/sys_vars}/t/license_basic.test | 0 .../{ => suite/sys_vars}/t/local_infile_basic.test | 0 .../{ => suite/sys_vars}/t/local_infile_func.test | 0 mysql-test/{ => suite/sys_vars}/t/log_basic.test | 0 .../t/log_bin_trust_function_creators_basic.test | 0 .../log_bin_trust_function_creators_func-master.opt | 0 .../t/log_bin_trust_function_creators_func.test | 0 .../t/log_bin_trust_routine_creators_basic.test | 0 .../{ => suite/sys_vars}/t/log_output_basic.test | 0 .../{ => suite/sys_vars}/t/log_output_func.test | 0 .../t/log_queries_not_using_indexes_basic.test | 0 .../sys_vars}/t/long_query_time_basic.test | 0 .../sys_vars}/t/low_priority_updates_basic.test | 0 .../sys_vars}/t/max_allowed_packet_basic.test | 0 .../sys_vars}/t/max_allowed_packet_func.test | 0 .../t/max_binlog_cache_size_func-master.opt | 0 .../sys_vars}/t/max_binlog_size_basic.test | 0 .../sys_vars}/t/max_connections_basic.test | 0 .../sys_vars}/t/max_delayed_threads_basic.test | 0 .../sys_vars}/t/max_error_count_basic.test | 0 .../t/max_insert_delayed_threads_basic.test | 0 .../{ => suite/sys_vars}/t/max_join_size_func.test | 0 .../sys_vars}/t/max_length_for_sort_data_basic.test | 0 .../sys_vars}/t/max_prepared_stmt_count_basic.test | 0 .../sys_vars}/t/max_prepared_stmt_count_func.test | 0 .../sys_vars}/t/max_relay_log_size_basic.test | 0 .../sys_vars}/t/max_seeks_for_key_func.test | 0 .../sys_vars}/t/max_sort_length_basic.test | 0 .../sys_vars}/t/max_sort_length_func.test | 0 .../sys_vars}/t/max_sp_recursion_depth_basic.test | 0 .../sys_vars}/t/max_sp_recursion_depth_func.test | 0 .../sys_vars}/t/max_user_connections_basic.test | 0 .../sys_vars}/t/max_user_connections_func.test | 0 .../sys_vars}/t/myisam_data_pointer_size_basic.test | 0 .../sys_vars}/t/myisam_data_pointer_size_func.test | 0 .../sys_vars}/t/myisam_stats_method_basic.test | 0 .../sys_vars}/t/myisam_stats_method_func.test | 0 .../sys_vars}/t/myisam_use_mmap_basic.test | 0 .../sys_vars}/t/ndb_log_update_as_write_basic.test | 0 .../sys_vars}/t/ndb_log_updated_only_basic.test | 0 .../sys_vars}/t/net_buffer_length_basic.test | 0 .../sys_vars}/t/net_read_timeout_basic.test | 0 .../sys_vars}/t/net_write_timeout_basic.test | 0 mysql-test/{ => suite/sys_vars}/t/new_basic.test | 0 .../{ => suite/sys_vars}/t/old_passwords_basic.test | 0 .../{ => suite/sys_vars}/t/old_passwords_func.test | 0 .../sys_vars}/t/optimizer_prune_level_basic.test | 0 .../sys_vars}/t/optimizer_search_depth_basic.test | 0 .../sys_vars}/t/preload_buffer_size_basic.test | 0 .../sys_vars}/t/query_cache_limit_func.test | 0 .../sys_vars}/t/query_cache_type_basic.test | 0 .../sys_vars}/t/query_cache_type_func.test | 0 .../t/query_cache_wlock_invalidate_basic.test | 0 .../t/query_cache_wlock_invalidate_func.test | 0 .../sys_vars}/t/query_prealloc_size_func.test | 0 .../sys_vars}/t/read_buffer_size_basic.test | 0 .../{ => suite/sys_vars}/t/read_only_basic.test | 0 .../{ => suite/sys_vars}/t/read_only_func.test | 0 .../sys_vars}/t/read_rnd_buffer_size_basic.test | 0 .../sys_vars}/t/relay_log_purge_basic.test | 0 .../sys_vars}/t/rpl_init_slave_func-slave.opt | 0 .../{ => suite/sys_vars}/t/rpl_init_slave_func.test | 0 .../sys_vars}/t/rpl_max_binlog_size_func-master.opt | 0 .../sys_vars}/t/rpl_max_binlog_size_func.test | 1 + .../{ => suite/sys_vars}/t/secure_auth_basic.test | 0 .../sys_vars}/t/secure_auth_func-master.opt | 0 .../{ => suite/sys_vars}/t/secure_auth_func.test | 0 .../sys_vars}/t/slave_allow_batching_basic.test | 0 .../t/slave_compressed_protocol_basic.test | 0 .../sys_vars}/t/slave_exec_mode_basic.test | 0 .../sys_vars}/t/slave_net_timeout_basic.test | 0 .../sys_vars}/t/slow_launch_time_basic.test | 0 .../sys_vars}/t/slow_launch_time_func.test | 0 .../sys_vars}/t/slow_query_log_basic.test | 0 .../t/slow_query_log_file_basic-master.opt | 0 .../sys_vars}/t/slow_query_log_file_basic.test | 0 .../sys_vars}/t/slow_query_log_file_func-master.opt | 0 .../sys_vars}/t/slow_query_log_file_func.test | 0 .../{ => suite/sys_vars}/t/slow_query_log_func.test | 0 .../sys_vars}/t/sql_auto_is_null_basic.test | 0 .../sys_vars}/t/sql_big_selects_basic.test | 0 .../sys_vars}/t/sql_big_selects_func.test | 0 .../sys_vars}/t/sql_big_tables_basic.test | 0 .../{ => suite/sys_vars}/t/sql_big_tables_func.test | 0 .../sys_vars}/t/sql_buffer_result_basic.test | 0 .../sys_vars}/t/sql_buffer_result_func.test | 0 .../{ => suite/sys_vars}/t/sql_log_bin_basic.test | 0 .../{ => suite/sys_vars}/t/sql_log_off_basic.test | 0 .../{ => suite/sys_vars}/t/sql_log_off_func.test | 0 .../sys_vars}/t/sql_low_priority_updates_basic.test | 0 .../sys_vars}/t/sql_low_priority_updates_func.test | 0 .../sys_vars}/t/sql_max_join_size_func.test | 0 .../{ => suite/sys_vars}/t/sql_mode_basic.test | 0 .../{ => suite/sys_vars}/t/sql_mode_func.test | 0 .../{ => suite/sys_vars}/t/sql_notes_basic.test | 0 .../{ => suite/sys_vars}/t/sql_notes_func.test | 0 .../sys_vars}/t/sql_quote_show_create_basic.test | 0 .../sys_vars}/t/sql_quote_show_create_func.test | 0 .../sys_vars}/t/sql_safe_updates_basic.test | 0 .../sys_vars}/t/sql_safe_updates_func.test | 0 .../sys_vars}/t/sql_select_limit_func.test | 0 .../sys_vars}/t/sql_slave_skip_counter_basic.test | 0 .../{ => suite/sys_vars}/t/sql_warnings_basic.test | 0 .../{ => suite/sys_vars}/t/sql_warnings_func.test | 0 mysql-test/{ => suite/sys_vars}/t/ssl_ca_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_capath_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_cert_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_cipher_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_key_basic.test | 0 .../sys_vars}/t/storage_engine_basic-master.opt | 0 .../sys_vars}/t/storage_engine_basic.test | 0 .../{ => suite/sys_vars}/t/sync_frm_basic.test | 0 .../sys_vars}/t/system_time_zone_basic.test | 0 .../sys_vars}/t/table_definition_cache_basic.test | 0 .../sys_vars}/t/table_lock_wait_timeout_basic.test | 0 .../sys_vars}/t/table_open_cache_basic.test | 0 .../sys_vars}/t/thread_cache_size_func.test | 0 .../sys_vars}/t/thread_handling_basic.test | 0 .../{ => suite/sys_vars}/t/time_zone_basic.test | 0 .../{ => suite/sys_vars}/t/time_zone_func.test | 0 .../{ => suite/sys_vars}/t/timed_mutexes_basic.test | 0 .../{ => suite/sys_vars}/t/timestamp_func.test | 0 .../t/timestamp_sysdate_is_now_func-master.opt | 0 .../sys_vars}/t/timestamp_sysdate_is_now_func.test | 0 mysql-test/{ => suite/sys_vars}/t/tmpdir_basic.test | 0 .../{ => suite/sys_vars}/t/tx_isolation_basic.test | 0 .../sys_vars}/t/tx_isolation_func-master.opt | 0 .../{ => suite/sys_vars}/t/tx_isolation_func.test | 0 .../{ => suite/sys_vars}/t/unique_checks_basic.test | 0 .../t/updatable_views_with_limit_basic.test | 0 .../t/updatable_views_with_limit_func.test | 0 .../{ => suite/sys_vars}/t/version_basic.test | 0 .../sys_vars}/t/version_comment_basic.test | 0 .../sys_vars}/t/version_compile_machine_basic.test | 0 .../sys_vars}/t/version_compile_os_basic.test | 0 .../{ => suite/sys_vars}/t/wait_timeout_func.test | 0 .../{ => suite/sys_vars}/t/warning_count_basic.test | 0 515 files changed, 22 insertions(+), 20 deletions(-) rename mysql-test/{include => suite/sys_vars/inc}/charset_basic.inc (100%) rename mysql-test/{include => suite/sys_vars/inc}/collation_basic.inc (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_commit_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_increment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_increment_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_offset_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_offset_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/autocommit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/automatic_sp_privileges_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/automatic_sp_privileges_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/basedir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/big_tables_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/binlog_format_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_client_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_client_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_connection_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_connection_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_database_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_database_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_filesystem_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_results_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_results_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_server_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_server_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_system_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_connection_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_connection_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_database_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_database_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_server_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_server_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/completion_type_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/completion_type_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/concurrent_insert_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/concurrent_insert_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/connect_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/datadir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/default_week_format_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/default_week_format_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delay_key_write_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delay_key_write_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delayed_insert_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delayed_insert_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/div_precision_increment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/div_precision_increment_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/engine_condition_pushdown_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/error_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/event_scheduler_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/event_scheduler_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/expire_logs_days_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/flush_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/foreign_key_checks_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/foreign_key_checks_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ft_boolean_syntax_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ft_boolean_syntax_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_file_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_file_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/group_concat_max_len_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/group_concat_max_len_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_compress_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_crypt_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_csv_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_dynamic_loading_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_geometry_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_innodb_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_ndbcluster_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_openssl_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_partitioning_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_query_cache_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_rtree_keys_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_ssl_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_symlink_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/hostname_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/identity_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/identity_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/init_connect_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/init_slave_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_additional_mem_pool_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_autoextend_increment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_autoinc_lock_mode_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_autoinc_lock_mode_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_buffer_pool_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_checksums_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_commit_concurrency_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_data_file_path_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_data_home_dir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_doublewrite_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_fast_shutdown_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_file_io_threads_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_file_per_table_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_flush_log_at_trx_commit_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_flush_method_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_force_recovery_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_lock_wait_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_locks_unsafe_for_binlog_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_file_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_files_in_group_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_group_home_dir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_max_dirty_pages_pct_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_max_dirty_pages_pct_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_mirrored_log_groups_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_open_files_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_rollback_on_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_support_xa_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_support_xa_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_table_locks_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_table_locks_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_thread_concurrency_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_thread_sleep_delay_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/insert_id_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/insert_id_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/interactive_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/interactive_timeout_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/keep_files_on_create_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/key_buffer_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/last_insert_id_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/lc_time_names_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/lc_time_names_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/license_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/local_infile_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/local_infile_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_bin_trust_function_creators_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_bin_trust_function_creators_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_bin_trust_routine_creators_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_output_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_output_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_queries_not_using_indexes_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/long_query_time_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/low_priority_updates_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_allowed_packet_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_allowed_packet_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_binlog_cache_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_binlog_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_connections_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_delayed_threads_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_error_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_insert_delayed_threads_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_join_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_length_for_sort_data_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_prepared_stmt_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_prepared_stmt_count_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_relay_log_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_seeks_for_key_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sort_length_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sort_length_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sp_recursion_depth_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sp_recursion_depth_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_user_connections_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_user_connections_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_data_pointer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_data_pointer_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_sort_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_stats_method_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_stats_method_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_use_mmap_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ndb_log_update_as_write_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ndb_log_updated_only_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/net_buffer_length_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/net_read_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/net_write_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/new_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/old_passwords_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/old_passwords_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/optimizer_prune_level_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/optimizer_search_depth_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/preload_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_type_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_type_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_wlock_invalidate_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_wlock_invalidate_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_prealloc_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_only_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_only_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_rnd_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/relay_log_purge_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/rpl_init_slave_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/rpl_max_binlog_size_func.result (91%) rename mysql-test/{ => suite/sys_vars}/r/secure_auth_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/secure_auth_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_allow_batching_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_compressed_protocol_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_exec_mode_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_net_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_launch_time_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_launch_time_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_file_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_file_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_auto_is_null_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_selects_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_selects_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_tables_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_tables_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_buffer_result_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_buffer_result_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_log_bin_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_log_off_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_log_off_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_low_priority_updates_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_low_priority_updates_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_max_join_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_mode_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_mode_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_notes_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_notes_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_quote_show_create_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_quote_show_create_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_safe_updates_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_safe_updates_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_select_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_slave_skip_counter_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_warnings_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_warnings_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_ca_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_capath_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_cert_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_cipher_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_key_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/storage_engine_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sync_frm_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/system_time_zone_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/table_definition_cache_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/table_lock_wait_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/table_open_cache_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/thread_cache_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/thread_handling_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/time_zone_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/time_zone_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/timed_mutexes_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/timestamp_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/timestamp_sysdate_is_now_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/tmpdir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/tx_isolation_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/tx_isolation_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/unique_checks_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/updatable_views_with_limit_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/updatable_views_with_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_comment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_compile_machine_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_compile_os_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/wait_timeout_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/warning_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_commit_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_increment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_increment_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_offset_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_offset_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/autocommit_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/autocommit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/automatic_sp_privileges_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/automatic_sp_privileges_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/basedir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/big_tables_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/binlog_format_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_client_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_client_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_connection_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_connection_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_database_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_database_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_filesystem_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_filesystem_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_results_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_results_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_server_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_server_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_system_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/collation_connection_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/collation_connection_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/collation_database_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/collation_database_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/collation_server_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/collation_server_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/completion_type_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/completion_type_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/completion_type_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/concurrent_insert_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/concurrent_insert_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/connect_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/datadir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/default_week_format_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/default_week_format_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delay_key_write_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delay_key_write_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/delay_key_write_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delayed_insert_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delayed_insert_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/div_precision_increment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/div_precision_increment_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/engine_condition_pushdown_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/error_count_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/event_scheduler_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/event_scheduler_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/expire_logs_days_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/flush_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/foreign_key_checks_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/foreign_key_checks_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ft_boolean_syntax_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ft_boolean_syntax_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_basic-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/group_concat_max_len_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/group_concat_max_len_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_compress_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_crypt_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_csv_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_dynamic_loading_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_geometry_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_innodb_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_ndbcluster_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_openssl_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_partitioning_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_query_cache_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_rtree_keys_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_ssl_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_symlink_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/hostname_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/identity_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/identity_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/identity_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/init_connect_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/init_slave_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_additional_mem_pool_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoextend_increment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoinc_lock_mode_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoinc_lock_mode_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoinc_lock_mode_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_buffer_pool_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_checksums_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_commit_concurrency_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_data_file_path_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_data_home_dir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_doublewrite_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_fast_shutdown_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_file_io_threads_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_file_per_table_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_flush_log_at_trx_commit_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_flush_method_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_force_recovery_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_lock_wait_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_locks_unsafe_for_binlog_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_file_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_files_in_group_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_group_home_dir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_max_dirty_pages_pct_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_max_dirty_pages_pct_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_mirrored_log_groups_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_open_files_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_rollback_on_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_support_xa_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_support_xa_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_table_locks_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_table_locks_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_thread_concurrency_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/insert_id_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/insert_id_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/interactive_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/interactive_timeout_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/keep_files_on_create_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/key_buffer_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/last_insert_id_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/last_insert_id_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/lc_time_names_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/lc_time_names_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/license_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/local_infile_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/local_infile_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_function_creators_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_function_creators_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_function_creators_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_routine_creators_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_output_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_output_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_queries_not_using_indexes_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/long_query_time_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/low_priority_updates_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_allowed_packet_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_allowed_packet_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_binlog_cache_size_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/max_binlog_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_connections_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_delayed_threads_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_error_count_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_insert_delayed_threads_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_join_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_length_for_sort_data_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_prepared_stmt_count_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_prepared_stmt_count_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_relay_log_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_seeks_for_key_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sort_length_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sort_length_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sp_recursion_depth_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sp_recursion_depth_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_user_connections_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_user_connections_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_data_pointer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_data_pointer_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_stats_method_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_stats_method_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_use_mmap_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ndb_log_update_as_write_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ndb_log_updated_only_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/net_buffer_length_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/net_read_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/net_write_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/new_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/old_passwords_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/old_passwords_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/optimizer_prune_level_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/optimizer_search_depth_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/preload_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_type_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_type_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_wlock_invalidate_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_wlock_invalidate_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_prealloc_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_only_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_only_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_rnd_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/relay_log_purge_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_init_slave_func-slave.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_init_slave_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_max_binlog_size_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_max_binlog_size_func.test (98%) rename mysql-test/{ => suite/sys_vars}/t/secure_auth_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/secure_auth_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/secure_auth_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_allow_batching_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_compressed_protocol_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_exec_mode_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_net_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_launch_time_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_launch_time_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_basic-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_auto_is_null_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_selects_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_selects_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_tables_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_tables_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_buffer_result_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_buffer_result_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_log_bin_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_log_off_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_log_off_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_low_priority_updates_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_low_priority_updates_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_max_join_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_mode_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_mode_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_notes_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_notes_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_quote_show_create_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_quote_show_create_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_safe_updates_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_safe_updates_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_select_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_slave_skip_counter_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_warnings_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_warnings_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_ca_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_capath_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_cert_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_cipher_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_key_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/storage_engine_basic-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/storage_engine_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sync_frm_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/system_time_zone_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/table_definition_cache_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/table_lock_wait_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/table_open_cache_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/thread_cache_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/thread_handling_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/time_zone_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/time_zone_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/timed_mutexes_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/timestamp_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/timestamp_sysdate_is_now_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/timestamp_sysdate_is_now_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/tmpdir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/tx_isolation_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/tx_isolation_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/tx_isolation_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/unique_checks_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/updatable_views_with_limit_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/updatable_views_with_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_comment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_compile_machine_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_compile_os_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/wait_timeout_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/warning_count_basic.test (100%) diff --git a/mysql-test/include/charset_basic.inc b/mysql-test/suite/sys_vars/inc/charset_basic.inc similarity index 100% rename from mysql-test/include/charset_basic.inc rename to mysql-test/suite/sys_vars/inc/charset_basic.inc diff --git a/mysql-test/include/collation_basic.inc b/mysql-test/suite/sys_vars/inc/collation_basic.inc similarity index 100% rename from mysql-test/include/collation_basic.inc rename to mysql-test/suite/sys_vars/inc/collation_basic.inc diff --git a/mysql-test/r/auto_commit_basic.result b/mysql-test/suite/sys_vars/r/auto_commit_basic.result similarity index 100% rename from mysql-test/r/auto_commit_basic.result rename to mysql-test/suite/sys_vars/r/auto_commit_basic.result diff --git a/mysql-test/r/auto_increment_increment_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result similarity index 100% rename from mysql-test/r/auto_increment_increment_basic.result rename to mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result diff --git a/mysql-test/r/auto_increment_increment_func.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result similarity index 100% rename from mysql-test/r/auto_increment_increment_func.result rename to mysql-test/suite/sys_vars/r/auto_increment_increment_func.result diff --git a/mysql-test/r/auto_increment_offset_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result similarity index 100% rename from mysql-test/r/auto_increment_offset_basic.result rename to mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result diff --git a/mysql-test/r/auto_increment_offset_func.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result similarity index 100% rename from mysql-test/r/auto_increment_offset_func.result rename to mysql-test/suite/sys_vars/r/auto_increment_offset_func.result diff --git a/mysql-test/r/autocommit_func.result b/mysql-test/suite/sys_vars/r/autocommit_func.result similarity index 100% rename from mysql-test/r/autocommit_func.result rename to mysql-test/suite/sys_vars/r/autocommit_func.result diff --git a/mysql-test/r/automatic_sp_privileges_basic.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result similarity index 100% rename from mysql-test/r/automatic_sp_privileges_basic.result rename to mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result diff --git a/mysql-test/r/automatic_sp_privileges_func.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result similarity index 100% rename from mysql-test/r/automatic_sp_privileges_func.result rename to mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result diff --git a/mysql-test/r/basedir_basic.result b/mysql-test/suite/sys_vars/r/basedir_basic.result similarity index 100% rename from mysql-test/r/basedir_basic.result rename to mysql-test/suite/sys_vars/r/basedir_basic.result diff --git a/mysql-test/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result similarity index 100% rename from mysql-test/r/big_tables_basic.result rename to mysql-test/suite/sys_vars/r/big_tables_basic.result diff --git a/mysql-test/r/binlog_format_basic.result b/mysql-test/suite/sys_vars/r/binlog_format_basic.result similarity index 100% rename from mysql-test/r/binlog_format_basic.result rename to mysql-test/suite/sys_vars/r/binlog_format_basic.result diff --git a/mysql-test/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result similarity index 100% rename from mysql-test/r/character_set_client_basic.result rename to mysql-test/suite/sys_vars/r/character_set_client_basic.result diff --git a/mysql-test/r/character_set_client_func.result b/mysql-test/suite/sys_vars/r/character_set_client_func.result similarity index 100% rename from mysql-test/r/character_set_client_func.result rename to mysql-test/suite/sys_vars/r/character_set_client_func.result diff --git a/mysql-test/r/character_set_connection_basic.result b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result similarity index 100% rename from mysql-test/r/character_set_connection_basic.result rename to mysql-test/suite/sys_vars/r/character_set_connection_basic.result diff --git a/mysql-test/r/character_set_connection_func.result b/mysql-test/suite/sys_vars/r/character_set_connection_func.result similarity index 100% rename from mysql-test/r/character_set_connection_func.result rename to mysql-test/suite/sys_vars/r/character_set_connection_func.result diff --git a/mysql-test/r/character_set_database_basic.result b/mysql-test/suite/sys_vars/r/character_set_database_basic.result similarity index 100% rename from mysql-test/r/character_set_database_basic.result rename to mysql-test/suite/sys_vars/r/character_set_database_basic.result diff --git a/mysql-test/r/character_set_database_func.result b/mysql-test/suite/sys_vars/r/character_set_database_func.result similarity index 100% rename from mysql-test/r/character_set_database_func.result rename to mysql-test/suite/sys_vars/r/character_set_database_func.result diff --git a/mysql-test/r/character_set_filesystem_basic.result b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result similarity index 100% rename from mysql-test/r/character_set_filesystem_basic.result rename to mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result diff --git a/mysql-test/r/character_set_results_basic.result b/mysql-test/suite/sys_vars/r/character_set_results_basic.result similarity index 100% rename from mysql-test/r/character_set_results_basic.result rename to mysql-test/suite/sys_vars/r/character_set_results_basic.result diff --git a/mysql-test/r/character_set_results_func.result b/mysql-test/suite/sys_vars/r/character_set_results_func.result similarity index 100% rename from mysql-test/r/character_set_results_func.result rename to mysql-test/suite/sys_vars/r/character_set_results_func.result diff --git a/mysql-test/r/character_set_server_basic.result b/mysql-test/suite/sys_vars/r/character_set_server_basic.result similarity index 100% rename from mysql-test/r/character_set_server_basic.result rename to mysql-test/suite/sys_vars/r/character_set_server_basic.result diff --git a/mysql-test/r/character_set_server_func.result b/mysql-test/suite/sys_vars/r/character_set_server_func.result similarity index 100% rename from mysql-test/r/character_set_server_func.result rename to mysql-test/suite/sys_vars/r/character_set_server_func.result diff --git a/mysql-test/r/character_set_system_basic.result b/mysql-test/suite/sys_vars/r/character_set_system_basic.result similarity index 100% rename from mysql-test/r/character_set_system_basic.result rename to mysql-test/suite/sys_vars/r/character_set_system_basic.result diff --git a/mysql-test/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result similarity index 100% rename from mysql-test/r/collation_connection_basic.result rename to mysql-test/suite/sys_vars/r/collation_connection_basic.result diff --git a/mysql-test/r/collation_connection_func.result b/mysql-test/suite/sys_vars/r/collation_connection_func.result similarity index 100% rename from mysql-test/r/collation_connection_func.result rename to mysql-test/suite/sys_vars/r/collation_connection_func.result diff --git a/mysql-test/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result similarity index 100% rename from mysql-test/r/collation_database_basic.result rename to mysql-test/suite/sys_vars/r/collation_database_basic.result diff --git a/mysql-test/r/collation_database_func.result b/mysql-test/suite/sys_vars/r/collation_database_func.result similarity index 100% rename from mysql-test/r/collation_database_func.result rename to mysql-test/suite/sys_vars/r/collation_database_func.result diff --git a/mysql-test/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result similarity index 100% rename from mysql-test/r/collation_server_basic.result rename to mysql-test/suite/sys_vars/r/collation_server_basic.result diff --git a/mysql-test/r/collation_server_func.result b/mysql-test/suite/sys_vars/r/collation_server_func.result similarity index 100% rename from mysql-test/r/collation_server_func.result rename to mysql-test/suite/sys_vars/r/collation_server_func.result diff --git a/mysql-test/r/completion_type_basic.result b/mysql-test/suite/sys_vars/r/completion_type_basic.result similarity index 100% rename from mysql-test/r/completion_type_basic.result rename to mysql-test/suite/sys_vars/r/completion_type_basic.result diff --git a/mysql-test/r/completion_type_func.result b/mysql-test/suite/sys_vars/r/completion_type_func.result similarity index 100% rename from mysql-test/r/completion_type_func.result rename to mysql-test/suite/sys_vars/r/completion_type_func.result diff --git a/mysql-test/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result similarity index 100% rename from mysql-test/r/concurrent_insert_basic.result rename to mysql-test/suite/sys_vars/r/concurrent_insert_basic.result diff --git a/mysql-test/r/concurrent_insert_func.result b/mysql-test/suite/sys_vars/r/concurrent_insert_func.result similarity index 100% rename from mysql-test/r/concurrent_insert_func.result rename to mysql-test/suite/sys_vars/r/concurrent_insert_func.result diff --git a/mysql-test/r/connect_timeout_basic.result b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result similarity index 100% rename from mysql-test/r/connect_timeout_basic.result rename to mysql-test/suite/sys_vars/r/connect_timeout_basic.result diff --git a/mysql-test/r/datadir_basic.result b/mysql-test/suite/sys_vars/r/datadir_basic.result similarity index 100% rename from mysql-test/r/datadir_basic.result rename to mysql-test/suite/sys_vars/r/datadir_basic.result diff --git a/mysql-test/r/default_week_format_basic.result b/mysql-test/suite/sys_vars/r/default_week_format_basic.result similarity index 100% rename from mysql-test/r/default_week_format_basic.result rename to mysql-test/suite/sys_vars/r/default_week_format_basic.result diff --git a/mysql-test/r/default_week_format_func.result b/mysql-test/suite/sys_vars/r/default_week_format_func.result similarity index 100% rename from mysql-test/r/default_week_format_func.result rename to mysql-test/suite/sys_vars/r/default_week_format_func.result diff --git a/mysql-test/r/delay_key_write_basic.result b/mysql-test/suite/sys_vars/r/delay_key_write_basic.result similarity index 100% rename from mysql-test/r/delay_key_write_basic.result rename to mysql-test/suite/sys_vars/r/delay_key_write_basic.result diff --git a/mysql-test/r/delay_key_write_func.result b/mysql-test/suite/sys_vars/r/delay_key_write_func.result similarity index 100% rename from mysql-test/r/delay_key_write_func.result rename to mysql-test/suite/sys_vars/r/delay_key_write_func.result diff --git a/mysql-test/r/delayed_insert_limit_func.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result similarity index 100% rename from mysql-test/r/delayed_insert_limit_func.result rename to mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result diff --git a/mysql-test/r/delayed_insert_timeout_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result similarity index 100% rename from mysql-test/r/delayed_insert_timeout_basic.result rename to mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result diff --git a/mysql-test/r/div_precision_increment_basic.result b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result similarity index 100% rename from mysql-test/r/div_precision_increment_basic.result rename to mysql-test/suite/sys_vars/r/div_precision_increment_basic.result diff --git a/mysql-test/r/div_precision_increment_func.result b/mysql-test/suite/sys_vars/r/div_precision_increment_func.result similarity index 100% rename from mysql-test/r/div_precision_increment_func.result rename to mysql-test/suite/sys_vars/r/div_precision_increment_func.result diff --git a/mysql-test/r/engine_condition_pushdown_basic.result b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result similarity index 100% rename from mysql-test/r/engine_condition_pushdown_basic.result rename to mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result diff --git a/mysql-test/r/error_count_basic.result b/mysql-test/suite/sys_vars/r/error_count_basic.result similarity index 100% rename from mysql-test/r/error_count_basic.result rename to mysql-test/suite/sys_vars/r/error_count_basic.result diff --git a/mysql-test/r/event_scheduler_basic.result b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result similarity index 100% rename from mysql-test/r/event_scheduler_basic.result rename to mysql-test/suite/sys_vars/r/event_scheduler_basic.result diff --git a/mysql-test/r/event_scheduler_func.result b/mysql-test/suite/sys_vars/r/event_scheduler_func.result similarity index 100% rename from mysql-test/r/event_scheduler_func.result rename to mysql-test/suite/sys_vars/r/event_scheduler_func.result diff --git a/mysql-test/r/expire_logs_days_basic.result b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result similarity index 100% rename from mysql-test/r/expire_logs_days_basic.result rename to mysql-test/suite/sys_vars/r/expire_logs_days_basic.result diff --git a/mysql-test/r/flush_basic.result b/mysql-test/suite/sys_vars/r/flush_basic.result similarity index 100% rename from mysql-test/r/flush_basic.result rename to mysql-test/suite/sys_vars/r/flush_basic.result diff --git a/mysql-test/r/foreign_key_checks_basic.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result similarity index 100% rename from mysql-test/r/foreign_key_checks_basic.result rename to mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result diff --git a/mysql-test/r/foreign_key_checks_func.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_func.result similarity index 100% rename from mysql-test/r/foreign_key_checks_func.result rename to mysql-test/suite/sys_vars/r/foreign_key_checks_func.result diff --git a/mysql-test/r/ft_boolean_syntax_basic.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result similarity index 100% rename from mysql-test/r/ft_boolean_syntax_basic.result rename to mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result diff --git a/mysql-test/r/ft_boolean_syntax_func.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result similarity index 100% rename from mysql-test/r/ft_boolean_syntax_func.result rename to mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result diff --git a/mysql-test/r/general_log_basic.result b/mysql-test/suite/sys_vars/r/general_log_basic.result similarity index 100% rename from mysql-test/r/general_log_basic.result rename to mysql-test/suite/sys_vars/r/general_log_basic.result diff --git a/mysql-test/r/general_log_file_basic.result b/mysql-test/suite/sys_vars/r/general_log_file_basic.result similarity index 100% rename from mysql-test/r/general_log_file_basic.result rename to mysql-test/suite/sys_vars/r/general_log_file_basic.result diff --git a/mysql-test/r/general_log_file_func.result b/mysql-test/suite/sys_vars/r/general_log_file_func.result similarity index 100% rename from mysql-test/r/general_log_file_func.result rename to mysql-test/suite/sys_vars/r/general_log_file_func.result diff --git a/mysql-test/r/general_log_func.result b/mysql-test/suite/sys_vars/r/general_log_func.result similarity index 100% rename from mysql-test/r/general_log_func.result rename to mysql-test/suite/sys_vars/r/general_log_func.result diff --git a/mysql-test/r/group_concat_max_len_basic.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result similarity index 100% rename from mysql-test/r/group_concat_max_len_basic.result rename to mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result diff --git a/mysql-test/r/group_concat_max_len_func.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_func.result similarity index 100% rename from mysql-test/r/group_concat_max_len_func.result rename to mysql-test/suite/sys_vars/r/group_concat_max_len_func.result diff --git a/mysql-test/r/have_compress_basic.result b/mysql-test/suite/sys_vars/r/have_compress_basic.result similarity index 100% rename from mysql-test/r/have_compress_basic.result rename to mysql-test/suite/sys_vars/r/have_compress_basic.result diff --git a/mysql-test/r/have_crypt_basic.result b/mysql-test/suite/sys_vars/r/have_crypt_basic.result similarity index 100% rename from mysql-test/r/have_crypt_basic.result rename to mysql-test/suite/sys_vars/r/have_crypt_basic.result diff --git a/mysql-test/r/have_csv_basic.result b/mysql-test/suite/sys_vars/r/have_csv_basic.result similarity index 100% rename from mysql-test/r/have_csv_basic.result rename to mysql-test/suite/sys_vars/r/have_csv_basic.result diff --git a/mysql-test/r/have_dynamic_loading_basic.result b/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result similarity index 100% rename from mysql-test/r/have_dynamic_loading_basic.result rename to mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result diff --git a/mysql-test/r/have_geometry_basic.result b/mysql-test/suite/sys_vars/r/have_geometry_basic.result similarity index 100% rename from mysql-test/r/have_geometry_basic.result rename to mysql-test/suite/sys_vars/r/have_geometry_basic.result diff --git a/mysql-test/r/have_innodb_basic.result b/mysql-test/suite/sys_vars/r/have_innodb_basic.result similarity index 100% rename from mysql-test/r/have_innodb_basic.result rename to mysql-test/suite/sys_vars/r/have_innodb_basic.result diff --git a/mysql-test/r/have_ndbcluster_basic.result b/mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result similarity index 100% rename from mysql-test/r/have_ndbcluster_basic.result rename to mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result diff --git a/mysql-test/r/have_openssl_basic.result b/mysql-test/suite/sys_vars/r/have_openssl_basic.result similarity index 100% rename from mysql-test/r/have_openssl_basic.result rename to mysql-test/suite/sys_vars/r/have_openssl_basic.result diff --git a/mysql-test/r/have_partitioning_basic.result b/mysql-test/suite/sys_vars/r/have_partitioning_basic.result similarity index 100% rename from mysql-test/r/have_partitioning_basic.result rename to mysql-test/suite/sys_vars/r/have_partitioning_basic.result diff --git a/mysql-test/r/have_query_cache_basic.result b/mysql-test/suite/sys_vars/r/have_query_cache_basic.result similarity index 100% rename from mysql-test/r/have_query_cache_basic.result rename to mysql-test/suite/sys_vars/r/have_query_cache_basic.result diff --git a/mysql-test/r/have_rtree_keys_basic.result b/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result similarity index 100% rename from mysql-test/r/have_rtree_keys_basic.result rename to mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result diff --git a/mysql-test/r/have_ssl_basic.result b/mysql-test/suite/sys_vars/r/have_ssl_basic.result similarity index 100% rename from mysql-test/r/have_ssl_basic.result rename to mysql-test/suite/sys_vars/r/have_ssl_basic.result diff --git a/mysql-test/r/have_symlink_basic.result b/mysql-test/suite/sys_vars/r/have_symlink_basic.result similarity index 100% rename from mysql-test/r/have_symlink_basic.result rename to mysql-test/suite/sys_vars/r/have_symlink_basic.result diff --git a/mysql-test/r/hostname_basic.result b/mysql-test/suite/sys_vars/r/hostname_basic.result similarity index 100% rename from mysql-test/r/hostname_basic.result rename to mysql-test/suite/sys_vars/r/hostname_basic.result diff --git a/mysql-test/r/identity_basic.result b/mysql-test/suite/sys_vars/r/identity_basic.result similarity index 100% rename from mysql-test/r/identity_basic.result rename to mysql-test/suite/sys_vars/r/identity_basic.result diff --git a/mysql-test/r/identity_func.result b/mysql-test/suite/sys_vars/r/identity_func.result similarity index 100% rename from mysql-test/r/identity_func.result rename to mysql-test/suite/sys_vars/r/identity_func.result diff --git a/mysql-test/r/init_connect_basic.result b/mysql-test/suite/sys_vars/r/init_connect_basic.result similarity index 100% rename from mysql-test/r/init_connect_basic.result rename to mysql-test/suite/sys_vars/r/init_connect_basic.result diff --git a/mysql-test/r/init_slave_basic.result b/mysql-test/suite/sys_vars/r/init_slave_basic.result similarity index 100% rename from mysql-test/r/init_slave_basic.result rename to mysql-test/suite/sys_vars/r/init_slave_basic.result diff --git a/mysql-test/r/innodb_additional_mem_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result similarity index 100% rename from mysql-test/r/innodb_additional_mem_pool_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result diff --git a/mysql-test/r/innodb_autoextend_increment_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result similarity index 100% rename from mysql-test/r/innodb_autoextend_increment_basic.result rename to mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result diff --git a/mysql-test/r/innodb_autoinc_lock_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result similarity index 100% rename from mysql-test/r/innodb_autoinc_lock_mode_basic.result rename to mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result diff --git a/mysql-test/r/innodb_autoinc_lock_mode_func.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result similarity index 100% rename from mysql-test/r/innodb_autoinc_lock_mode_func.result rename to mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result diff --git a/mysql-test/r/innodb_buffer_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result similarity index 100% rename from mysql-test/r/innodb_buffer_pool_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result diff --git a/mysql-test/r/innodb_checksums_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result similarity index 100% rename from mysql-test/r/innodb_checksums_basic.result rename to mysql-test/suite/sys_vars/r/innodb_checksums_basic.result diff --git a/mysql-test/r/innodb_commit_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result similarity index 100% rename from mysql-test/r/innodb_commit_concurrency_basic.result rename to mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result diff --git a/mysql-test/r/innodb_data_file_path_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result similarity index 100% rename from mysql-test/r/innodb_data_file_path_basic.result rename to mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result diff --git a/mysql-test/r/innodb_data_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result similarity index 100% rename from mysql-test/r/innodb_data_home_dir_basic.result rename to mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result diff --git a/mysql-test/r/innodb_doublewrite_basic.result b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result similarity index 100% rename from mysql-test/r/innodb_doublewrite_basic.result rename to mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result diff --git a/mysql-test/r/innodb_fast_shutdown_basic.result b/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result similarity index 100% rename from mysql-test/r/innodb_fast_shutdown_basic.result rename to mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result diff --git a/mysql-test/r/innodb_file_io_threads_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result similarity index 100% rename from mysql-test/r/innodb_file_io_threads_basic.result rename to mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result diff --git a/mysql-test/r/innodb_file_per_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result similarity index 100% rename from mysql-test/r/innodb_file_per_table_basic.result rename to mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result diff --git a/mysql-test/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result similarity index 100% rename from mysql-test/r/innodb_flush_log_at_trx_commit_basic.result rename to mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result diff --git a/mysql-test/r/innodb_flush_method_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result similarity index 100% rename from mysql-test/r/innodb_flush_method_basic.result rename to mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result diff --git a/mysql-test/r/innodb_force_recovery_basic.result b/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result similarity index 100% rename from mysql-test/r/innodb_force_recovery_basic.result rename to mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result diff --git a/mysql-test/r/innodb_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result similarity index 100% rename from mysql-test/r/innodb_lock_wait_timeout_basic.result rename to mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result diff --git a/mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result b/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result similarity index 100% rename from mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result rename to mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result diff --git a/mysql-test/r/innodb_log_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result similarity index 100% rename from mysql-test/r/innodb_log_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result diff --git a/mysql-test/r/innodb_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result similarity index 100% rename from mysql-test/r/innodb_log_file_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result diff --git a/mysql-test/r/innodb_log_files_in_group_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result similarity index 100% rename from mysql-test/r/innodb_log_files_in_group_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result diff --git a/mysql-test/r/innodb_log_group_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result similarity index 100% rename from mysql-test/r/innodb_log_group_home_dir_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result similarity index 100% rename from mysql-test/r/innodb_max_dirty_pages_pct_basic.result rename to mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_func.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result similarity index 100% rename from mysql-test/r/innodb_max_dirty_pages_pct_func.result rename to mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result diff --git a/mysql-test/r/innodb_mirrored_log_groups_basic.result b/mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result similarity index 100% rename from mysql-test/r/innodb_mirrored_log_groups_basic.result rename to mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result diff --git a/mysql-test/r/innodb_open_files_basic.result b/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result similarity index 100% rename from mysql-test/r/innodb_open_files_basic.result rename to mysql-test/suite/sys_vars/r/innodb_open_files_basic.result diff --git a/mysql-test/r/innodb_rollback_on_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result similarity index 100% rename from mysql-test/r/innodb_rollback_on_timeout_basic.result rename to mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result diff --git a/mysql-test/r/innodb_support_xa_basic.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result similarity index 100% rename from mysql-test/r/innodb_support_xa_basic.result rename to mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result diff --git a/mysql-test/r/innodb_support_xa_func.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result similarity index 100% rename from mysql-test/r/innodb_support_xa_func.result rename to mysql-test/suite/sys_vars/r/innodb_support_xa_func.result diff --git a/mysql-test/r/innodb_table_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result similarity index 100% rename from mysql-test/r/innodb_table_locks_basic.result rename to mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result diff --git a/mysql-test/r/innodb_table_locks_func.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result similarity index 100% rename from mysql-test/r/innodb_table_locks_func.result rename to mysql-test/suite/sys_vars/r/innodb_table_locks_func.result diff --git a/mysql-test/r/innodb_thread_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result similarity index 100% rename from mysql-test/r/innodb_thread_concurrency_basic.result rename to mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result diff --git a/mysql-test/r/innodb_thread_sleep_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result similarity index 100% rename from mysql-test/r/innodb_thread_sleep_delay_basic.result rename to mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result diff --git a/mysql-test/r/insert_id_basic.result b/mysql-test/suite/sys_vars/r/insert_id_basic.result similarity index 100% rename from mysql-test/r/insert_id_basic.result rename to mysql-test/suite/sys_vars/r/insert_id_basic.result diff --git a/mysql-test/r/insert_id_func.result b/mysql-test/suite/sys_vars/r/insert_id_func.result similarity index 100% rename from mysql-test/r/insert_id_func.result rename to mysql-test/suite/sys_vars/r/insert_id_func.result diff --git a/mysql-test/r/interactive_timeout_basic.result b/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result similarity index 100% rename from mysql-test/r/interactive_timeout_basic.result rename to mysql-test/suite/sys_vars/r/interactive_timeout_basic.result diff --git a/mysql-test/r/interactive_timeout_func.result b/mysql-test/suite/sys_vars/r/interactive_timeout_func.result similarity index 100% rename from mysql-test/r/interactive_timeout_func.result rename to mysql-test/suite/sys_vars/r/interactive_timeout_func.result diff --git a/mysql-test/r/keep_files_on_create_basic.result b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result similarity index 100% rename from mysql-test/r/keep_files_on_create_basic.result rename to mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result diff --git a/mysql-test/r/key_buffer_size_func.result b/mysql-test/suite/sys_vars/r/key_buffer_size_func.result similarity index 100% rename from mysql-test/r/key_buffer_size_func.result rename to mysql-test/suite/sys_vars/r/key_buffer_size_func.result diff --git a/mysql-test/r/last_insert_id_func.result b/mysql-test/suite/sys_vars/r/last_insert_id_func.result similarity index 100% rename from mysql-test/r/last_insert_id_func.result rename to mysql-test/suite/sys_vars/r/last_insert_id_func.result diff --git a/mysql-test/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result similarity index 100% rename from mysql-test/r/lc_time_names_basic.result rename to mysql-test/suite/sys_vars/r/lc_time_names_basic.result diff --git a/mysql-test/r/lc_time_names_func.result b/mysql-test/suite/sys_vars/r/lc_time_names_func.result similarity index 100% rename from mysql-test/r/lc_time_names_func.result rename to mysql-test/suite/sys_vars/r/lc_time_names_func.result diff --git a/mysql-test/r/license_basic.result b/mysql-test/suite/sys_vars/r/license_basic.result similarity index 100% rename from mysql-test/r/license_basic.result rename to mysql-test/suite/sys_vars/r/license_basic.result diff --git a/mysql-test/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result similarity index 100% rename from mysql-test/r/local_infile_basic.result rename to mysql-test/suite/sys_vars/r/local_infile_basic.result diff --git a/mysql-test/r/local_infile_func.result b/mysql-test/suite/sys_vars/r/local_infile_func.result similarity index 100% rename from mysql-test/r/local_infile_func.result rename to mysql-test/suite/sys_vars/r/local_infile_func.result diff --git a/mysql-test/r/log_basic.result b/mysql-test/suite/sys_vars/r/log_basic.result similarity index 100% rename from mysql-test/r/log_basic.result rename to mysql-test/suite/sys_vars/r/log_basic.result diff --git a/mysql-test/r/log_bin_trust_function_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result similarity index 100% rename from mysql-test/r/log_bin_trust_function_creators_basic.result rename to mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result diff --git a/mysql-test/r/log_bin_trust_function_creators_func.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result similarity index 100% rename from mysql-test/r/log_bin_trust_function_creators_func.result rename to mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result diff --git a/mysql-test/r/log_bin_trust_routine_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result similarity index 100% rename from mysql-test/r/log_bin_trust_routine_creators_basic.result rename to mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result diff --git a/mysql-test/r/log_output_basic.result b/mysql-test/suite/sys_vars/r/log_output_basic.result similarity index 100% rename from mysql-test/r/log_output_basic.result rename to mysql-test/suite/sys_vars/r/log_output_basic.result diff --git a/mysql-test/r/log_output_func.result b/mysql-test/suite/sys_vars/r/log_output_func.result similarity index 100% rename from mysql-test/r/log_output_func.result rename to mysql-test/suite/sys_vars/r/log_output_func.result diff --git a/mysql-test/r/log_queries_not_using_indexes_basic.result b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result similarity index 100% rename from mysql-test/r/log_queries_not_using_indexes_basic.result rename to mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result diff --git a/mysql-test/r/long_query_time_basic.result b/mysql-test/suite/sys_vars/r/long_query_time_basic.result similarity index 100% rename from mysql-test/r/long_query_time_basic.result rename to mysql-test/suite/sys_vars/r/long_query_time_basic.result diff --git a/mysql-test/r/low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result similarity index 100% rename from mysql-test/r/low_priority_updates_basic.result rename to mysql-test/suite/sys_vars/r/low_priority_updates_basic.result diff --git a/mysql-test/r/max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result similarity index 100% rename from mysql-test/r/max_allowed_packet_basic.result rename to mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result diff --git a/mysql-test/r/max_allowed_packet_func.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result similarity index 100% rename from mysql-test/r/max_allowed_packet_func.result rename to mysql-test/suite/sys_vars/r/max_allowed_packet_func.result diff --git a/mysql-test/r/max_binlog_cache_size_func.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result similarity index 100% rename from mysql-test/r/max_binlog_cache_size_func.result rename to mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result diff --git a/mysql-test/r/max_binlog_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result similarity index 100% rename from mysql-test/r/max_binlog_size_basic.result rename to mysql-test/suite/sys_vars/r/max_binlog_size_basic.result diff --git a/mysql-test/r/max_connections_basic.result b/mysql-test/suite/sys_vars/r/max_connections_basic.result similarity index 100% rename from mysql-test/r/max_connections_basic.result rename to mysql-test/suite/sys_vars/r/max_connections_basic.result diff --git a/mysql-test/r/max_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result similarity index 100% rename from mysql-test/r/max_delayed_threads_basic.result rename to mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result diff --git a/mysql-test/r/max_error_count_basic.result b/mysql-test/suite/sys_vars/r/max_error_count_basic.result similarity index 100% rename from mysql-test/r/max_error_count_basic.result rename to mysql-test/suite/sys_vars/r/max_error_count_basic.result diff --git a/mysql-test/r/max_insert_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result similarity index 100% rename from mysql-test/r/max_insert_delayed_threads_basic.result rename to mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result diff --git a/mysql-test/r/max_join_size_func.result b/mysql-test/suite/sys_vars/r/max_join_size_func.result similarity index 100% rename from mysql-test/r/max_join_size_func.result rename to mysql-test/suite/sys_vars/r/max_join_size_func.result diff --git a/mysql-test/r/max_length_for_sort_data_basic.result b/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result similarity index 100% rename from mysql-test/r/max_length_for_sort_data_basic.result rename to mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result diff --git a/mysql-test/r/max_prepared_stmt_count_basic.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result similarity index 100% rename from mysql-test/r/max_prepared_stmt_count_basic.result rename to mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result diff --git a/mysql-test/r/max_prepared_stmt_count_func.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result similarity index 100% rename from mysql-test/r/max_prepared_stmt_count_func.result rename to mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result diff --git a/mysql-test/r/max_relay_log_size_basic.result b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result similarity index 100% rename from mysql-test/r/max_relay_log_size_basic.result rename to mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result diff --git a/mysql-test/r/max_seeks_for_key_func.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result similarity index 100% rename from mysql-test/r/max_seeks_for_key_func.result rename to mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result diff --git a/mysql-test/r/max_sort_length_basic.result b/mysql-test/suite/sys_vars/r/max_sort_length_basic.result similarity index 100% rename from mysql-test/r/max_sort_length_basic.result rename to mysql-test/suite/sys_vars/r/max_sort_length_basic.result diff --git a/mysql-test/r/max_sort_length_func.result b/mysql-test/suite/sys_vars/r/max_sort_length_func.result similarity index 100% rename from mysql-test/r/max_sort_length_func.result rename to mysql-test/suite/sys_vars/r/max_sort_length_func.result diff --git a/mysql-test/r/max_sp_recursion_depth_basic.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result similarity index 100% rename from mysql-test/r/max_sp_recursion_depth_basic.result rename to mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result diff --git a/mysql-test/r/max_sp_recursion_depth_func.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result similarity index 100% rename from mysql-test/r/max_sp_recursion_depth_func.result rename to mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result diff --git a/mysql-test/r/max_user_connections_basic.result b/mysql-test/suite/sys_vars/r/max_user_connections_basic.result similarity index 100% rename from mysql-test/r/max_user_connections_basic.result rename to mysql-test/suite/sys_vars/r/max_user_connections_basic.result diff --git a/mysql-test/r/max_user_connections_func.result b/mysql-test/suite/sys_vars/r/max_user_connections_func.result similarity index 100% rename from mysql-test/r/max_user_connections_func.result rename to mysql-test/suite/sys_vars/r/max_user_connections_func.result diff --git a/mysql-test/r/myisam_data_pointer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result similarity index 100% rename from mysql-test/r/myisam_data_pointer_size_basic.result rename to mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result diff --git a/mysql-test/r/myisam_data_pointer_size_func.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result similarity index 100% rename from mysql-test/r/myisam_data_pointer_size_func.result rename to mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result diff --git a/mysql-test/r/myisam_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result similarity index 100% rename from mysql-test/r/myisam_sort_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result diff --git a/mysql-test/r/myisam_stats_method_basic.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result similarity index 100% rename from mysql-test/r/myisam_stats_method_basic.result rename to mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result diff --git a/mysql-test/r/myisam_stats_method_func.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result similarity index 100% rename from mysql-test/r/myisam_stats_method_func.result rename to mysql-test/suite/sys_vars/r/myisam_stats_method_func.result diff --git a/mysql-test/r/myisam_use_mmap_basic.result b/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result similarity index 100% rename from mysql-test/r/myisam_use_mmap_basic.result rename to mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result diff --git a/mysql-test/r/ndb_log_update_as_write_basic.result b/mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result similarity index 100% rename from mysql-test/r/ndb_log_update_as_write_basic.result rename to mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result diff --git a/mysql-test/r/ndb_log_updated_only_basic.result b/mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result similarity index 100% rename from mysql-test/r/ndb_log_updated_only_basic.result rename to mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result diff --git a/mysql-test/r/net_buffer_length_basic.result b/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result similarity index 100% rename from mysql-test/r/net_buffer_length_basic.result rename to mysql-test/suite/sys_vars/r/net_buffer_length_basic.result diff --git a/mysql-test/r/net_read_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result similarity index 100% rename from mysql-test/r/net_read_timeout_basic.result rename to mysql-test/suite/sys_vars/r/net_read_timeout_basic.result diff --git a/mysql-test/r/net_write_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result similarity index 100% rename from mysql-test/r/net_write_timeout_basic.result rename to mysql-test/suite/sys_vars/r/net_write_timeout_basic.result diff --git a/mysql-test/r/new_basic.result b/mysql-test/suite/sys_vars/r/new_basic.result similarity index 100% rename from mysql-test/r/new_basic.result rename to mysql-test/suite/sys_vars/r/new_basic.result diff --git a/mysql-test/r/old_passwords_basic.result b/mysql-test/suite/sys_vars/r/old_passwords_basic.result similarity index 100% rename from mysql-test/r/old_passwords_basic.result rename to mysql-test/suite/sys_vars/r/old_passwords_basic.result diff --git a/mysql-test/r/old_passwords_func.result b/mysql-test/suite/sys_vars/r/old_passwords_func.result similarity index 100% rename from mysql-test/r/old_passwords_func.result rename to mysql-test/suite/sys_vars/r/old_passwords_func.result diff --git a/mysql-test/r/optimizer_prune_level_basic.result b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result similarity index 100% rename from mysql-test/r/optimizer_prune_level_basic.result rename to mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result diff --git a/mysql-test/r/optimizer_search_depth_basic.result b/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result similarity index 100% rename from mysql-test/r/optimizer_search_depth_basic.result rename to mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result diff --git a/mysql-test/r/preload_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result similarity index 100% rename from mysql-test/r/preload_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result diff --git a/mysql-test/r/query_cache_limit_func.result b/mysql-test/suite/sys_vars/r/query_cache_limit_func.result similarity index 100% rename from mysql-test/r/query_cache_limit_func.result rename to mysql-test/suite/sys_vars/r/query_cache_limit_func.result diff --git 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 index 1af70b3af84..ada57a0b55c 100644 --- 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 @@ -1,7 +1,7 @@ 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 diff --git a/mysql-test/r/query_cache_type_basic.result b/mysql-test/suite/sys_vars/r/query_cache_type_basic.result similarity index 100% rename from mysql-test/r/query_cache_type_basic.result rename to mysql-test/suite/sys_vars/r/query_cache_type_basic.result diff --git a/mysql-test/r/query_cache_type_func.result b/mysql-test/suite/sys_vars/r/query_cache_type_func.result similarity index 100% rename from mysql-test/r/query_cache_type_func.result rename to mysql-test/suite/sys_vars/r/query_cache_type_func.result diff --git a/mysql-test/r/query_cache_wlock_invalidate_basic.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result similarity index 100% rename from mysql-test/r/query_cache_wlock_invalidate_basic.result rename to mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result diff --git a/mysql-test/r/query_cache_wlock_invalidate_func.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result similarity index 100% rename from mysql-test/r/query_cache_wlock_invalidate_func.result rename to mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result diff --git a/mysql-test/r/query_prealloc_size_func.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_func.result similarity index 100% rename from mysql-test/r/query_prealloc_size_func.result rename to mysql-test/suite/sys_vars/r/query_prealloc_size_func.result diff --git a/mysql-test/r/read_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result similarity index 100% rename from mysql-test/r/read_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/read_buffer_size_basic.result diff --git a/mysql-test/r/read_only_basic.result b/mysql-test/suite/sys_vars/r/read_only_basic.result similarity index 100% rename from mysql-test/r/read_only_basic.result rename to mysql-test/suite/sys_vars/r/read_only_basic.result diff --git a/mysql-test/r/read_only_func.result b/mysql-test/suite/sys_vars/r/read_only_func.result similarity index 100% rename from mysql-test/r/read_only_func.result rename to mysql-test/suite/sys_vars/r/read_only_func.result diff --git a/mysql-test/r/read_rnd_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result similarity index 100% rename from mysql-test/r/read_rnd_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result diff --git a/mysql-test/r/relay_log_purge_basic.result b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result similarity index 100% rename from mysql-test/r/relay_log_purge_basic.result rename to mysql-test/suite/sys_vars/r/relay_log_purge_basic.result diff --git a/mysql-test/r/rpl_init_slave_func.result b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result similarity index 100% rename from mysql-test/r/rpl_init_slave_func.result rename to mysql-test/suite/sys_vars/r/rpl_init_slave_func.result diff --git a/mysql-test/r/rpl_max_binlog_size_func.result b/mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result similarity index 91% rename from mysql-test/r/rpl_max_binlog_size_func.result rename to mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result index 08c1ea407fd..a2ffd10d322 100644 --- a/mysql-test/r/rpl_max_binlog_size_func.result +++ b/mysql-test/suite/sys_vars/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; diff --git a/mysql-test/r/secure_auth_basic.result b/mysql-test/suite/sys_vars/r/secure_auth_basic.result similarity index 100% rename from mysql-test/r/secure_auth_basic.result rename to mysql-test/suite/sys_vars/r/secure_auth_basic.result diff --git a/mysql-test/r/secure_auth_func.result b/mysql-test/suite/sys_vars/r/secure_auth_func.result similarity index 100% rename from mysql-test/r/secure_auth_func.result rename to mysql-test/suite/sys_vars/r/secure_auth_func.result diff --git a/mysql-test/r/slave_allow_batching_basic.result b/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result similarity index 100% rename from mysql-test/r/slave_allow_batching_basic.result rename to mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result diff --git a/mysql-test/r/slave_compressed_protocol_basic.result b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result similarity index 100% rename from mysql-test/r/slave_compressed_protocol_basic.result rename to mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result diff --git a/mysql-test/r/slave_exec_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result similarity index 100% rename from mysql-test/r/slave_exec_mode_basic.result rename to mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result diff --git a/mysql-test/r/slave_net_timeout_basic.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result similarity index 100% rename from mysql-test/r/slave_net_timeout_basic.result rename to mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result diff --git a/mysql-test/r/slow_launch_time_basic.result b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result similarity index 100% rename from mysql-test/r/slow_launch_time_basic.result rename to mysql-test/suite/sys_vars/r/slow_launch_time_basic.result diff --git a/mysql-test/r/slow_launch_time_func.result b/mysql-test/suite/sys_vars/r/slow_launch_time_func.result similarity index 100% rename from mysql-test/r/slow_launch_time_func.result rename to mysql-test/suite/sys_vars/r/slow_launch_time_func.result diff --git a/mysql-test/r/slow_query_log_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result similarity index 100% rename from mysql-test/r/slow_query_log_basic.result rename to mysql-test/suite/sys_vars/r/slow_query_log_basic.result diff --git a/mysql-test/r/slow_query_log_file_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result similarity index 100% rename from mysql-test/r/slow_query_log_file_basic.result rename to mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result diff --git a/mysql-test/r/slow_query_log_file_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_func.result similarity index 100% rename from mysql-test/r/slow_query_log_file_func.result rename to mysql-test/suite/sys_vars/r/slow_query_log_file_func.result diff --git a/mysql-test/r/slow_query_log_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_func.result similarity index 100% rename from mysql-test/r/slow_query_log_func.result rename to mysql-test/suite/sys_vars/r/slow_query_log_func.result diff --git a/mysql-test/r/sql_auto_is_null_basic.result b/mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result similarity index 100% rename from mysql-test/r/sql_auto_is_null_basic.result rename to mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result diff --git a/mysql-test/r/sql_big_selects_basic.result b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result similarity index 100% rename from mysql-test/r/sql_big_selects_basic.result rename to mysql-test/suite/sys_vars/r/sql_big_selects_basic.result diff --git a/mysql-test/r/sql_big_selects_func.result b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result similarity index 100% rename from mysql-test/r/sql_big_selects_func.result rename to mysql-test/suite/sys_vars/r/sql_big_selects_func.result diff --git a/mysql-test/r/sql_big_tables_basic.result b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result similarity index 100% rename from mysql-test/r/sql_big_tables_basic.result rename to mysql-test/suite/sys_vars/r/sql_big_tables_basic.result diff --git a/mysql-test/r/sql_big_tables_func.result b/mysql-test/suite/sys_vars/r/sql_big_tables_func.result similarity index 100% rename from mysql-test/r/sql_big_tables_func.result rename to mysql-test/suite/sys_vars/r/sql_big_tables_func.result diff --git a/mysql-test/r/sql_buffer_result_basic.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result similarity index 100% rename from mysql-test/r/sql_buffer_result_basic.result rename to mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result diff --git a/mysql-test/r/sql_buffer_result_func.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_func.result similarity index 100% rename from mysql-test/r/sql_buffer_result_func.result rename to mysql-test/suite/sys_vars/r/sql_buffer_result_func.result diff --git a/mysql-test/r/sql_log_bin_basic.result b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result similarity index 100% rename from mysql-test/r/sql_log_bin_basic.result rename to mysql-test/suite/sys_vars/r/sql_log_bin_basic.result diff --git a/mysql-test/r/sql_log_off_basic.result b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result similarity index 100% rename from mysql-test/r/sql_log_off_basic.result rename to mysql-test/suite/sys_vars/r/sql_log_off_basic.result diff --git a/mysql-test/r/sql_log_off_func.result b/mysql-test/suite/sys_vars/r/sql_log_off_func.result similarity index 100% rename from mysql-test/r/sql_log_off_func.result rename to mysql-test/suite/sys_vars/r/sql_log_off_func.result diff --git a/mysql-test/r/sql_low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result similarity index 100% rename from mysql-test/r/sql_low_priority_updates_basic.result rename to mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result diff --git a/mysql-test/r/sql_low_priority_updates_func.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result similarity index 100% rename from mysql-test/r/sql_low_priority_updates_func.result rename to mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result diff --git a/mysql-test/r/sql_max_join_size_func.result b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result similarity index 100% rename from mysql-test/r/sql_max_join_size_func.result rename to mysql-test/suite/sys_vars/r/sql_max_join_size_func.result diff --git a/mysql-test/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result similarity index 100% rename from mysql-test/r/sql_mode_basic.result rename to mysql-test/suite/sys_vars/r/sql_mode_basic.result diff --git a/mysql-test/r/sql_mode_func.result b/mysql-test/suite/sys_vars/r/sql_mode_func.result similarity index 100% rename from mysql-test/r/sql_mode_func.result rename to mysql-test/suite/sys_vars/r/sql_mode_func.result diff --git a/mysql-test/r/sql_notes_basic.result b/mysql-test/suite/sys_vars/r/sql_notes_basic.result similarity index 100% rename from mysql-test/r/sql_notes_basic.result rename to mysql-test/suite/sys_vars/r/sql_notes_basic.result diff --git a/mysql-test/r/sql_notes_func.result b/mysql-test/suite/sys_vars/r/sql_notes_func.result similarity index 100% rename from mysql-test/r/sql_notes_func.result rename to mysql-test/suite/sys_vars/r/sql_notes_func.result diff --git a/mysql-test/r/sql_quote_show_create_basic.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result similarity index 100% rename from mysql-test/r/sql_quote_show_create_basic.result rename to mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result diff --git a/mysql-test/r/sql_quote_show_create_func.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result similarity index 100% rename from mysql-test/r/sql_quote_show_create_func.result rename to mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result diff --git a/mysql-test/r/sql_safe_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result similarity index 100% rename from mysql-test/r/sql_safe_updates_basic.result rename to mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result diff --git a/mysql-test/r/sql_safe_updates_func.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result similarity index 100% rename from mysql-test/r/sql_safe_updates_func.result rename to mysql-test/suite/sys_vars/r/sql_safe_updates_func.result diff --git a/mysql-test/r/sql_select_limit_func.result b/mysql-test/suite/sys_vars/r/sql_select_limit_func.result similarity index 100% rename from mysql-test/r/sql_select_limit_func.result rename to mysql-test/suite/sys_vars/r/sql_select_limit_func.result diff --git a/mysql-test/r/sql_slave_skip_counter_basic.result b/mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result similarity index 100% rename from mysql-test/r/sql_slave_skip_counter_basic.result rename to mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result diff --git a/mysql-test/r/sql_warnings_basic.result b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result similarity index 100% rename from mysql-test/r/sql_warnings_basic.result rename to mysql-test/suite/sys_vars/r/sql_warnings_basic.result diff --git a/mysql-test/r/sql_warnings_func.result b/mysql-test/suite/sys_vars/r/sql_warnings_func.result similarity index 100% rename from mysql-test/r/sql_warnings_func.result rename to mysql-test/suite/sys_vars/r/sql_warnings_func.result diff --git a/mysql-test/r/ssl_ca_basic.result b/mysql-test/suite/sys_vars/r/ssl_ca_basic.result similarity index 100% rename from mysql-test/r/ssl_ca_basic.result rename to mysql-test/suite/sys_vars/r/ssl_ca_basic.result diff --git a/mysql-test/r/ssl_capath_basic.result b/mysql-test/suite/sys_vars/r/ssl_capath_basic.result similarity index 100% rename from mysql-test/r/ssl_capath_basic.result rename to mysql-test/suite/sys_vars/r/ssl_capath_basic.result diff --git a/mysql-test/r/ssl_cert_basic.result b/mysql-test/suite/sys_vars/r/ssl_cert_basic.result similarity index 100% rename from mysql-test/r/ssl_cert_basic.result rename to mysql-test/suite/sys_vars/r/ssl_cert_basic.result diff --git a/mysql-test/r/ssl_cipher_basic.result b/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result similarity index 100% rename from mysql-test/r/ssl_cipher_basic.result rename to mysql-test/suite/sys_vars/r/ssl_cipher_basic.result diff --git a/mysql-test/r/ssl_key_basic.result b/mysql-test/suite/sys_vars/r/ssl_key_basic.result similarity index 100% rename from mysql-test/r/ssl_key_basic.result rename to mysql-test/suite/sys_vars/r/ssl_key_basic.result diff --git a/mysql-test/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result similarity index 100% rename from mysql-test/r/storage_engine_basic.result rename to mysql-test/suite/sys_vars/r/storage_engine_basic.result diff --git a/mysql-test/r/sync_frm_basic.result b/mysql-test/suite/sys_vars/r/sync_frm_basic.result similarity index 100% rename from mysql-test/r/sync_frm_basic.result rename to mysql-test/suite/sys_vars/r/sync_frm_basic.result diff --git a/mysql-test/r/system_time_zone_basic.result b/mysql-test/suite/sys_vars/r/system_time_zone_basic.result similarity index 100% rename from mysql-test/r/system_time_zone_basic.result rename to mysql-test/suite/sys_vars/r/system_time_zone_basic.result diff --git a/mysql-test/r/table_definition_cache_basic.result b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result similarity index 100% rename from mysql-test/r/table_definition_cache_basic.result rename to mysql-test/suite/sys_vars/r/table_definition_cache_basic.result diff --git a/mysql-test/r/table_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result similarity index 100% rename from mysql-test/r/table_lock_wait_timeout_basic.result rename to mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result diff --git a/mysql-test/r/table_open_cache_basic.result b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result similarity index 100% rename from mysql-test/r/table_open_cache_basic.result rename to mysql-test/suite/sys_vars/r/table_open_cache_basic.result diff --git a/mysql-test/r/thread_cache_size_func.result b/mysql-test/suite/sys_vars/r/thread_cache_size_func.result similarity index 100% rename from mysql-test/r/thread_cache_size_func.result rename to mysql-test/suite/sys_vars/r/thread_cache_size_func.result diff --git a/mysql-test/r/thread_handling_basic.result b/mysql-test/suite/sys_vars/r/thread_handling_basic.result similarity index 100% rename from mysql-test/r/thread_handling_basic.result rename to mysql-test/suite/sys_vars/r/thread_handling_basic.result diff --git a/mysql-test/r/time_zone_basic.result b/mysql-test/suite/sys_vars/r/time_zone_basic.result similarity index 100% rename from mysql-test/r/time_zone_basic.result rename to mysql-test/suite/sys_vars/r/time_zone_basic.result diff --git a/mysql-test/r/time_zone_func.result b/mysql-test/suite/sys_vars/r/time_zone_func.result similarity index 100% rename from mysql-test/r/time_zone_func.result rename to mysql-test/suite/sys_vars/r/time_zone_func.result diff --git a/mysql-test/r/timed_mutexes_basic.result b/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result similarity index 100% rename from mysql-test/r/timed_mutexes_basic.result rename to mysql-test/suite/sys_vars/r/timed_mutexes_basic.result diff --git a/mysql-test/r/timestamp_func.result b/mysql-test/suite/sys_vars/r/timestamp_func.result similarity index 100% rename from mysql-test/r/timestamp_func.result rename to mysql-test/suite/sys_vars/r/timestamp_func.result diff --git a/mysql-test/r/timestamp_sysdate_is_now_func.result b/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result similarity index 100% rename from mysql-test/r/timestamp_sysdate_is_now_func.result rename to mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result diff --git a/mysql-test/r/tmpdir_basic.result b/mysql-test/suite/sys_vars/r/tmpdir_basic.result similarity index 100% rename from mysql-test/r/tmpdir_basic.result rename to mysql-test/suite/sys_vars/r/tmpdir_basic.result diff --git a/mysql-test/r/tx_isolation_basic.result b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result similarity index 100% rename from mysql-test/r/tx_isolation_basic.result rename to mysql-test/suite/sys_vars/r/tx_isolation_basic.result diff --git a/mysql-test/r/tx_isolation_func.result b/mysql-test/suite/sys_vars/r/tx_isolation_func.result similarity index 100% rename from mysql-test/r/tx_isolation_func.result rename to mysql-test/suite/sys_vars/r/tx_isolation_func.result diff --git a/mysql-test/r/unique_checks_basic.result b/mysql-test/suite/sys_vars/r/unique_checks_basic.result similarity index 100% rename from mysql-test/r/unique_checks_basic.result rename to mysql-test/suite/sys_vars/r/unique_checks_basic.result diff --git a/mysql-test/r/updatable_views_with_limit_basic.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result similarity index 100% rename from mysql-test/r/updatable_views_with_limit_basic.result rename to mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result diff --git a/mysql-test/r/updatable_views_with_limit_func.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result similarity index 100% rename from mysql-test/r/updatable_views_with_limit_func.result rename to mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result diff --git a/mysql-test/r/version_basic.result b/mysql-test/suite/sys_vars/r/version_basic.result similarity index 100% rename from mysql-test/r/version_basic.result rename to mysql-test/suite/sys_vars/r/version_basic.result diff --git a/mysql-test/r/version_comment_basic.result b/mysql-test/suite/sys_vars/r/version_comment_basic.result similarity index 100% rename from mysql-test/r/version_comment_basic.result rename to mysql-test/suite/sys_vars/r/version_comment_basic.result diff --git a/mysql-test/r/version_compile_machine_basic.result b/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result similarity index 100% rename from mysql-test/r/version_compile_machine_basic.result rename to mysql-test/suite/sys_vars/r/version_compile_machine_basic.result diff --git a/mysql-test/r/version_compile_os_basic.result b/mysql-test/suite/sys_vars/r/version_compile_os_basic.result similarity index 100% rename from mysql-test/r/version_compile_os_basic.result rename to mysql-test/suite/sys_vars/r/version_compile_os_basic.result diff --git a/mysql-test/r/wait_timeout_func.result b/mysql-test/suite/sys_vars/r/wait_timeout_func.result similarity index 100% rename from mysql-test/r/wait_timeout_func.result rename to mysql-test/suite/sys_vars/r/wait_timeout_func.result diff --git a/mysql-test/r/warning_count_basic.result b/mysql-test/suite/sys_vars/r/warning_count_basic.result similarity index 100% rename from mysql-test/r/warning_count_basic.result rename to mysql-test/suite/sys_vars/r/warning_count_basic.result diff --git a/mysql-test/t/auto_commit_basic.test b/mysql-test/suite/sys_vars/t/auto_commit_basic.test similarity index 100% rename from mysql-test/t/auto_commit_basic.test rename to mysql-test/suite/sys_vars/t/auto_commit_basic.test diff --git a/mysql-test/t/auto_increment_increment_basic.test b/mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test similarity index 100% rename from mysql-test/t/auto_increment_increment_basic.test rename to mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test diff --git a/mysql-test/t/auto_increment_increment_func.test b/mysql-test/suite/sys_vars/t/auto_increment_increment_func.test similarity index 100% rename from mysql-test/t/auto_increment_increment_func.test rename to mysql-test/suite/sys_vars/t/auto_increment_increment_func.test diff --git a/mysql-test/t/auto_increment_offset_basic.test b/mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test similarity index 100% rename from mysql-test/t/auto_increment_offset_basic.test rename to mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test diff --git a/mysql-test/t/auto_increment_offset_func.test b/mysql-test/suite/sys_vars/t/auto_increment_offset_func.test similarity index 100% rename from mysql-test/t/auto_increment_offset_func.test rename to mysql-test/suite/sys_vars/t/auto_increment_offset_func.test diff --git a/mysql-test/t/autocommit_func-master.opt b/mysql-test/suite/sys_vars/t/autocommit_func-master.opt similarity index 100% rename from mysql-test/t/autocommit_func-master.opt rename to mysql-test/suite/sys_vars/t/autocommit_func-master.opt diff --git a/mysql-test/t/autocommit_func.test b/mysql-test/suite/sys_vars/t/autocommit_func.test similarity index 100% rename from mysql-test/t/autocommit_func.test rename to mysql-test/suite/sys_vars/t/autocommit_func.test diff --git a/mysql-test/t/automatic_sp_privileges_basic.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test similarity index 100% rename from mysql-test/t/automatic_sp_privileges_basic.test rename to mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test diff --git a/mysql-test/t/automatic_sp_privileges_func.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test similarity index 100% rename from mysql-test/t/automatic_sp_privileges_func.test rename to mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test diff --git a/mysql-test/t/basedir_basic.test b/mysql-test/suite/sys_vars/t/basedir_basic.test similarity index 100% rename from mysql-test/t/basedir_basic.test rename to mysql-test/suite/sys_vars/t/basedir_basic.test diff --git a/mysql-test/t/big_tables_basic.test b/mysql-test/suite/sys_vars/t/big_tables_basic.test similarity index 100% rename from mysql-test/t/big_tables_basic.test rename to mysql-test/suite/sys_vars/t/big_tables_basic.test diff --git a/mysql-test/t/binlog_format_basic.test b/mysql-test/suite/sys_vars/t/binlog_format_basic.test similarity index 100% rename from mysql-test/t/binlog_format_basic.test rename to mysql-test/suite/sys_vars/t/binlog_format_basic.test diff --git a/mysql-test/t/character_set_client_basic.test b/mysql-test/suite/sys_vars/t/character_set_client_basic.test similarity index 99% rename from mysql-test/t/character_set_client_basic.test rename to mysql-test/suite/sys_vars/t/character_set_client_basic.test index 69e4c07dcd8..177a663c112 100644 --- a/mysql-test/t/character_set_client_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' ################################################################################ diff --git a/mysql-test/t/character_set_client_func.test b/mysql-test/suite/sys_vars/t/character_set_client_func.test similarity index 100% rename from mysql-test/t/character_set_client_func.test rename to mysql-test/suite/sys_vars/t/character_set_client_func.test diff --git a/mysql-test/t/character_set_connection_basic.test b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test similarity index 99% rename from mysql-test/t/character_set_connection_basic.test rename to mysql-test/suite/sys_vars/t/character_set_connection_basic.test index 509f8d0d346..5e28d43ce3e 100644 --- a/mysql-test/t/character_set_connection_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_connection_func.test b/mysql-test/suite/sys_vars/t/character_set_connection_func.test similarity index 100% rename from mysql-test/t/character_set_connection_func.test rename to mysql-test/suite/sys_vars/t/character_set_connection_func.test diff --git a/mysql-test/t/character_set_database_basic.test b/mysql-test/suite/sys_vars/t/character_set_database_basic.test similarity index 99% rename from mysql-test/t/character_set_database_basic.test rename to mysql-test/suite/sys_vars/t/character_set_database_basic.test index 9690fb84b5a..08069c00ae0 100644 --- a/mysql-test/t/character_set_database_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_database_func.test b/mysql-test/suite/sys_vars/t/character_set_database_func.test similarity index 100% rename from mysql-test/t/character_set_database_func.test rename to mysql-test/suite/sys_vars/t/character_set_database_func.test diff --git a/mysql-test/t/character_set_filesystem_basic.test b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test similarity index 99% rename from mysql-test/t/character_set_filesystem_basic.test rename to mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test index 0117145a06b..3ba9c269a84 100644 --- a/mysql-test/t/character_set_filesystem_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_filesystem_func-master.opt b/mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt similarity index 100% rename from mysql-test/t/character_set_filesystem_func-master.opt rename to mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt diff --git a/mysql-test/t/character_set_results_basic.test b/mysql-test/suite/sys_vars/t/character_set_results_basic.test similarity index 99% rename from mysql-test/t/character_set_results_basic.test rename to mysql-test/suite/sys_vars/t/character_set_results_basic.test index aae05c824d1..98635c00287 100644 --- a/mysql-test/t/character_set_results_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_results_func.test b/mysql-test/suite/sys_vars/t/character_set_results_func.test similarity index 100% rename from mysql-test/t/character_set_results_func.test rename to mysql-test/suite/sys_vars/t/character_set_results_func.test diff --git a/mysql-test/t/character_set_server_basic.test b/mysql-test/suite/sys_vars/t/character_set_server_basic.test similarity index 99% rename from mysql-test/t/character_set_server_basic.test rename to mysql-test/suite/sys_vars/t/character_set_server_basic.test index 2b3c078363a..21eb3fb36dc 100644 --- a/mysql-test/t/character_set_server_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_server_func.test b/mysql-test/suite/sys_vars/t/character_set_server_func.test similarity index 100% rename from mysql-test/t/character_set_server_func.test rename to mysql-test/suite/sys_vars/t/character_set_server_func.test diff --git a/mysql-test/t/character_set_system_basic.test b/mysql-test/suite/sys_vars/t/character_set_system_basic.test similarity index 100% rename from mysql-test/t/character_set_system_basic.test rename to mysql-test/suite/sys_vars/t/character_set_system_basic.test diff --git a/mysql-test/t/collation_connection_basic.test b/mysql-test/suite/sys_vars/t/collation_connection_basic.test similarity index 99% rename from mysql-test/t/collation_connection_basic.test rename to mysql-test/suite/sys_vars/t/collation_connection_basic.test index f3544dd306e..bf82ea321b7 100644 --- a/mysql-test/t/collation_connection_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/collation_connection_func.test b/mysql-test/suite/sys_vars/t/collation_connection_func.test similarity index 100% rename from mysql-test/t/collation_connection_func.test rename to mysql-test/suite/sys_vars/t/collation_connection_func.test diff --git a/mysql-test/t/collation_database_basic.test b/mysql-test/suite/sys_vars/t/collation_database_basic.test similarity index 99% rename from mysql-test/t/collation_database_basic.test rename to mysql-test/suite/sys_vars/t/collation_database_basic.test index c130e276084..557f32b86a0 100644 --- a/mysql-test/t/collation_database_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/collation_database_func.test b/mysql-test/suite/sys_vars/t/collation_database_func.test similarity index 100% rename from mysql-test/t/collation_database_func.test rename to mysql-test/suite/sys_vars/t/collation_database_func.test diff --git a/mysql-test/t/collation_server_basic.test b/mysql-test/suite/sys_vars/t/collation_server_basic.test similarity index 99% rename from mysql-test/t/collation_server_basic.test rename to mysql-test/suite/sys_vars/t/collation_server_basic.test index c4b469007e5..a8af13c13ae 100644 --- a/mysql-test/t/collation_server_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/collation_server_func.test b/mysql-test/suite/sys_vars/t/collation_server_func.test similarity index 100% rename from mysql-test/t/collation_server_func.test rename to mysql-test/suite/sys_vars/t/collation_server_func.test diff --git a/mysql-test/t/completion_type_basic.test b/mysql-test/suite/sys_vars/t/completion_type_basic.test similarity index 100% rename from mysql-test/t/completion_type_basic.test rename to mysql-test/suite/sys_vars/t/completion_type_basic.test diff --git a/mysql-test/t/completion_type_func-master.opt b/mysql-test/suite/sys_vars/t/completion_type_func-master.opt similarity index 100% rename from mysql-test/t/completion_type_func-master.opt rename to mysql-test/suite/sys_vars/t/completion_type_func-master.opt diff --git a/mysql-test/t/completion_type_func.test b/mysql-test/suite/sys_vars/t/completion_type_func.test similarity index 100% rename from mysql-test/t/completion_type_func.test rename to mysql-test/suite/sys_vars/t/completion_type_func.test diff --git a/mysql-test/t/concurrent_insert_basic.test b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test similarity index 100% rename from mysql-test/t/concurrent_insert_basic.test rename to mysql-test/suite/sys_vars/t/concurrent_insert_basic.test diff --git a/mysql-test/t/concurrent_insert_func.test b/mysql-test/suite/sys_vars/t/concurrent_insert_func.test similarity index 100% rename from mysql-test/t/concurrent_insert_func.test rename to mysql-test/suite/sys_vars/t/concurrent_insert_func.test diff --git a/mysql-test/t/connect_timeout_basic.test b/mysql-test/suite/sys_vars/t/connect_timeout_basic.test similarity index 100% rename from mysql-test/t/connect_timeout_basic.test rename to mysql-test/suite/sys_vars/t/connect_timeout_basic.test diff --git a/mysql-test/t/datadir_basic.test b/mysql-test/suite/sys_vars/t/datadir_basic.test similarity index 100% rename from mysql-test/t/datadir_basic.test rename to mysql-test/suite/sys_vars/t/datadir_basic.test diff --git a/mysql-test/t/default_week_format_basic.test b/mysql-test/suite/sys_vars/t/default_week_format_basic.test similarity index 100% rename from mysql-test/t/default_week_format_basic.test rename to mysql-test/suite/sys_vars/t/default_week_format_basic.test diff --git a/mysql-test/t/default_week_format_func.test b/mysql-test/suite/sys_vars/t/default_week_format_func.test similarity index 100% rename from mysql-test/t/default_week_format_func.test rename to mysql-test/suite/sys_vars/t/default_week_format_func.test diff --git a/mysql-test/t/delay_key_write_basic.test b/mysql-test/suite/sys_vars/t/delay_key_write_basic.test similarity index 100% rename from mysql-test/t/delay_key_write_basic.test rename to mysql-test/suite/sys_vars/t/delay_key_write_basic.test diff --git a/mysql-test/t/delay_key_write_func-master.opt b/mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt similarity index 100% rename from mysql-test/t/delay_key_write_func-master.opt rename to mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt diff --git a/mysql-test/t/delay_key_write_func.test b/mysql-test/suite/sys_vars/t/delay_key_write_func.test similarity index 100% rename from mysql-test/t/delay_key_write_func.test rename to mysql-test/suite/sys_vars/t/delay_key_write_func.test diff --git a/mysql-test/t/delayed_insert_limit_func.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test similarity index 100% rename from mysql-test/t/delayed_insert_limit_func.test rename to mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test diff --git a/mysql-test/t/delayed_insert_timeout_basic.test b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test similarity index 100% rename from mysql-test/t/delayed_insert_timeout_basic.test rename to mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test diff --git a/mysql-test/t/div_precision_increment_basic.test b/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test similarity index 100% rename from mysql-test/t/div_precision_increment_basic.test rename to mysql-test/suite/sys_vars/t/div_precision_increment_basic.test diff --git a/mysql-test/t/div_precision_increment_func.test b/mysql-test/suite/sys_vars/t/div_precision_increment_func.test similarity index 100% rename from mysql-test/t/div_precision_increment_func.test rename to mysql-test/suite/sys_vars/t/div_precision_increment_func.test diff --git a/mysql-test/t/engine_condition_pushdown_basic.test b/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test similarity index 100% rename from mysql-test/t/engine_condition_pushdown_basic.test rename to mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test diff --git a/mysql-test/t/error_count_basic.test b/mysql-test/suite/sys_vars/t/error_count_basic.test similarity index 100% rename from mysql-test/t/error_count_basic.test rename to mysql-test/suite/sys_vars/t/error_count_basic.test diff --git a/mysql-test/t/event_scheduler_basic.test b/mysql-test/suite/sys_vars/t/event_scheduler_basic.test similarity index 100% rename from mysql-test/t/event_scheduler_basic.test rename to mysql-test/suite/sys_vars/t/event_scheduler_basic.test diff --git a/mysql-test/t/event_scheduler_func.test b/mysql-test/suite/sys_vars/t/event_scheduler_func.test similarity index 100% rename from mysql-test/t/event_scheduler_func.test rename to mysql-test/suite/sys_vars/t/event_scheduler_func.test diff --git a/mysql-test/t/expire_logs_days_basic.test b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test similarity index 100% rename from mysql-test/t/expire_logs_days_basic.test rename to mysql-test/suite/sys_vars/t/expire_logs_days_basic.test diff --git a/mysql-test/t/flush_basic.test b/mysql-test/suite/sys_vars/t/flush_basic.test similarity index 100% rename from mysql-test/t/flush_basic.test rename to mysql-test/suite/sys_vars/t/flush_basic.test diff --git a/mysql-test/t/foreign_key_checks_basic.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test similarity index 100% rename from mysql-test/t/foreign_key_checks_basic.test rename to mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test diff --git a/mysql-test/t/foreign_key_checks_func.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test similarity index 100% rename from mysql-test/t/foreign_key_checks_func.test rename to mysql-test/suite/sys_vars/t/foreign_key_checks_func.test diff --git a/mysql-test/t/ft_boolean_syntax_basic.test b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test similarity index 100% rename from mysql-test/t/ft_boolean_syntax_basic.test rename to mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test diff --git a/mysql-test/t/ft_boolean_syntax_func.test b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test similarity index 100% rename from mysql-test/t/ft_boolean_syntax_func.test rename to mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test diff --git a/mysql-test/t/general_log_basic.test b/mysql-test/suite/sys_vars/t/general_log_basic.test similarity index 100% rename from mysql-test/t/general_log_basic.test rename to mysql-test/suite/sys_vars/t/general_log_basic.test diff --git a/mysql-test/t/general_log_file_basic-master.opt b/mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt similarity index 100% rename from mysql-test/t/general_log_file_basic-master.opt rename to mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt diff --git a/mysql-test/t/general_log_file_basic.test b/mysql-test/suite/sys_vars/t/general_log_file_basic.test similarity index 100% rename from mysql-test/t/general_log_file_basic.test rename to mysql-test/suite/sys_vars/t/general_log_file_basic.test diff --git a/mysql-test/t/general_log_file_func-master.opt b/mysql-test/suite/sys_vars/t/general_log_file_func-master.opt similarity index 100% rename from mysql-test/t/general_log_file_func-master.opt rename to mysql-test/suite/sys_vars/t/general_log_file_func-master.opt diff --git a/mysql-test/t/general_log_file_func.test b/mysql-test/suite/sys_vars/t/general_log_file_func.test similarity index 100% rename from mysql-test/t/general_log_file_func.test rename to mysql-test/suite/sys_vars/t/general_log_file_func.test diff --git a/mysql-test/t/general_log_func.test b/mysql-test/suite/sys_vars/t/general_log_func.test similarity index 100% rename from mysql-test/t/general_log_func.test rename to mysql-test/suite/sys_vars/t/general_log_func.test diff --git a/mysql-test/t/group_concat_max_len_basic.test b/mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test similarity index 100% rename from mysql-test/t/group_concat_max_len_basic.test rename to mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test diff --git a/mysql-test/t/group_concat_max_len_func.test b/mysql-test/suite/sys_vars/t/group_concat_max_len_func.test similarity index 100% rename from mysql-test/t/group_concat_max_len_func.test rename to mysql-test/suite/sys_vars/t/group_concat_max_len_func.test diff --git a/mysql-test/t/have_compress_basic.test b/mysql-test/suite/sys_vars/t/have_compress_basic.test similarity index 100% rename from mysql-test/t/have_compress_basic.test rename to mysql-test/suite/sys_vars/t/have_compress_basic.test diff --git a/mysql-test/t/have_crypt_basic.test b/mysql-test/suite/sys_vars/t/have_crypt_basic.test similarity index 100% rename from mysql-test/t/have_crypt_basic.test rename to mysql-test/suite/sys_vars/t/have_crypt_basic.test diff --git a/mysql-test/t/have_csv_basic.test b/mysql-test/suite/sys_vars/t/have_csv_basic.test similarity index 100% rename from mysql-test/t/have_csv_basic.test rename to mysql-test/suite/sys_vars/t/have_csv_basic.test diff --git a/mysql-test/t/have_dynamic_loading_basic.test b/mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test similarity index 100% rename from mysql-test/t/have_dynamic_loading_basic.test rename to mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test diff --git a/mysql-test/t/have_geometry_basic.test b/mysql-test/suite/sys_vars/t/have_geometry_basic.test similarity index 100% rename from mysql-test/t/have_geometry_basic.test rename to mysql-test/suite/sys_vars/t/have_geometry_basic.test diff --git a/mysql-test/t/have_innodb_basic.test b/mysql-test/suite/sys_vars/t/have_innodb_basic.test similarity index 100% rename from mysql-test/t/have_innodb_basic.test rename to mysql-test/suite/sys_vars/t/have_innodb_basic.test diff --git a/mysql-test/t/have_ndbcluster_basic.test b/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test similarity index 100% rename from mysql-test/t/have_ndbcluster_basic.test rename to mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test diff --git a/mysql-test/t/have_openssl_basic.test b/mysql-test/suite/sys_vars/t/have_openssl_basic.test similarity index 100% rename from mysql-test/t/have_openssl_basic.test rename to mysql-test/suite/sys_vars/t/have_openssl_basic.test diff --git a/mysql-test/t/have_partitioning_basic.test b/mysql-test/suite/sys_vars/t/have_partitioning_basic.test similarity index 100% rename from mysql-test/t/have_partitioning_basic.test rename to mysql-test/suite/sys_vars/t/have_partitioning_basic.test diff --git a/mysql-test/t/have_query_cache_basic.test b/mysql-test/suite/sys_vars/t/have_query_cache_basic.test similarity index 100% rename from mysql-test/t/have_query_cache_basic.test rename to mysql-test/suite/sys_vars/t/have_query_cache_basic.test diff --git a/mysql-test/t/have_rtree_keys_basic.test b/mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test similarity index 100% rename from mysql-test/t/have_rtree_keys_basic.test rename to mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test diff --git a/mysql-test/t/have_ssl_basic.test b/mysql-test/suite/sys_vars/t/have_ssl_basic.test similarity index 100% rename from mysql-test/t/have_ssl_basic.test rename to mysql-test/suite/sys_vars/t/have_ssl_basic.test diff --git a/mysql-test/t/have_symlink_basic.test b/mysql-test/suite/sys_vars/t/have_symlink_basic.test similarity index 100% rename from mysql-test/t/have_symlink_basic.test rename to mysql-test/suite/sys_vars/t/have_symlink_basic.test diff --git a/mysql-test/t/hostname_basic.test b/mysql-test/suite/sys_vars/t/hostname_basic.test similarity index 100% rename from mysql-test/t/hostname_basic.test rename to mysql-test/suite/sys_vars/t/hostname_basic.test diff --git a/mysql-test/t/identity_basic.test b/mysql-test/suite/sys_vars/t/identity_basic.test similarity index 100% rename from mysql-test/t/identity_basic.test rename to mysql-test/suite/sys_vars/t/identity_basic.test diff --git a/mysql-test/t/identity_func-master.opt b/mysql-test/suite/sys_vars/t/identity_func-master.opt similarity index 100% rename from mysql-test/t/identity_func-master.opt rename to mysql-test/suite/sys_vars/t/identity_func-master.opt diff --git a/mysql-test/t/identity_func.test b/mysql-test/suite/sys_vars/t/identity_func.test similarity index 100% rename from mysql-test/t/identity_func.test rename to mysql-test/suite/sys_vars/t/identity_func.test diff --git a/mysql-test/t/init_connect_basic.test b/mysql-test/suite/sys_vars/t/init_connect_basic.test similarity index 100% rename from mysql-test/t/init_connect_basic.test rename to mysql-test/suite/sys_vars/t/init_connect_basic.test diff --git a/mysql-test/t/init_slave_basic.test b/mysql-test/suite/sys_vars/t/init_slave_basic.test similarity index 100% rename from mysql-test/t/init_slave_basic.test rename to mysql-test/suite/sys_vars/t/init_slave_basic.test diff --git a/mysql-test/t/innodb_additional_mem_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test similarity index 100% rename from mysql-test/t/innodb_additional_mem_pool_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test diff --git a/mysql-test/t/innodb_autoextend_increment_basic.test b/mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test similarity index 100% rename from mysql-test/t/innodb_autoextend_increment_basic.test rename to mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test diff --git a/mysql-test/t/innodb_autoinc_lock_mode_basic.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test similarity index 100% rename from mysql-test/t/innodb_autoinc_lock_mode_basic.test rename to mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func-master.opt b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt similarity index 100% rename from mysql-test/t/innodb_autoinc_lock_mode_func-master.opt rename to mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test similarity index 100% rename from mysql-test/t/innodb_autoinc_lock_mode_func.test rename to mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test diff --git a/mysql-test/t/innodb_buffer_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test similarity index 100% rename from mysql-test/t/innodb_buffer_pool_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test diff --git a/mysql-test/t/innodb_checksums_basic.test b/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test similarity index 100% rename from mysql-test/t/innodb_checksums_basic.test rename to mysql-test/suite/sys_vars/t/innodb_checksums_basic.test diff --git a/mysql-test/t/innodb_commit_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test similarity index 100% rename from mysql-test/t/innodb_commit_concurrency_basic.test rename to mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test diff --git a/mysql-test/t/innodb_data_file_path_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test similarity index 100% rename from mysql-test/t/innodb_data_file_path_basic.test rename to mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test diff --git a/mysql-test/t/innodb_data_home_dir_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test similarity index 100% rename from mysql-test/t/innodb_data_home_dir_basic.test rename to mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test diff --git a/mysql-test/t/innodb_doublewrite_basic.test b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test similarity index 100% rename from mysql-test/t/innodb_doublewrite_basic.test rename to mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test diff --git a/mysql-test/t/innodb_fast_shutdown_basic.test b/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test similarity index 100% rename from mysql-test/t/innodb_fast_shutdown_basic.test rename to mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test diff --git a/mysql-test/t/innodb_file_io_threads_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test similarity index 100% rename from mysql-test/t/innodb_file_io_threads_basic.test rename to mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test diff --git a/mysql-test/t/innodb_file_per_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test similarity index 100% rename from mysql-test/t/innodb_file_per_table_basic.test rename to mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test diff --git a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test similarity index 100% rename from mysql-test/t/innodb_flush_log_at_trx_commit_basic.test rename to mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test diff --git a/mysql-test/t/innodb_flush_method_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test similarity index 100% rename from mysql-test/t/innodb_flush_method_basic.test rename to mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test diff --git a/mysql-test/t/innodb_force_recovery_basic.test b/mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test similarity index 100% rename from mysql-test/t/innodb_force_recovery_basic.test rename to mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test diff --git a/mysql-test/t/innodb_lock_wait_timeout_basic.test b/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test similarity index 100% rename from mysql-test/t/innodb_lock_wait_timeout_basic.test rename to mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test diff --git a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test b/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test similarity index 100% rename from mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test rename to mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test diff --git a/mysql-test/t/innodb_log_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test similarity index 100% rename from mysql-test/t/innodb_log_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test diff --git a/mysql-test/t/innodb_log_file_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test similarity index 100% rename from mysql-test/t/innodb_log_file_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test diff --git a/mysql-test/t/innodb_log_files_in_group_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test similarity index 100% rename from mysql-test/t/innodb_log_files_in_group_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test diff --git a/mysql-test/t/innodb_log_group_home_dir_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test similarity index 100% rename from mysql-test/t/innodb_log_group_home_dir_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test similarity index 100% rename from mysql-test/t/innodb_max_dirty_pages_pct_basic.test rename to mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_func.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test similarity index 100% rename from mysql-test/t/innodb_max_dirty_pages_pct_func.test rename to mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test diff --git a/mysql-test/t/innodb_mirrored_log_groups_basic.test b/mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test similarity index 100% rename from mysql-test/t/innodb_mirrored_log_groups_basic.test rename to mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test diff --git a/mysql-test/t/innodb_open_files_basic.test b/mysql-test/suite/sys_vars/t/innodb_open_files_basic.test similarity index 100% rename from mysql-test/t/innodb_open_files_basic.test rename to mysql-test/suite/sys_vars/t/innodb_open_files_basic.test diff --git a/mysql-test/t/innodb_rollback_on_timeout_basic.test b/mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test similarity index 100% rename from mysql-test/t/innodb_rollback_on_timeout_basic.test rename to mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test diff --git a/mysql-test/t/innodb_support_xa_basic.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test similarity index 100% rename from mysql-test/t/innodb_support_xa_basic.test rename to mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test diff --git a/mysql-test/t/innodb_support_xa_func.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test similarity index 100% rename from mysql-test/t/innodb_support_xa_func.test rename to mysql-test/suite/sys_vars/t/innodb_support_xa_func.test diff --git a/mysql-test/t/innodb_table_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test similarity index 100% rename from mysql-test/t/innodb_table_locks_basic.test rename to mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test diff --git a/mysql-test/t/innodb_table_locks_func.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test similarity index 100% rename from mysql-test/t/innodb_table_locks_func.test rename to mysql-test/suite/sys_vars/t/innodb_table_locks_func.test diff --git a/mysql-test/t/innodb_thread_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test similarity index 100% rename from mysql-test/t/innodb_thread_concurrency_basic.test rename to mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test diff --git a/mysql-test/t/insert_id_basic.test b/mysql-test/suite/sys_vars/t/insert_id_basic.test similarity index 100% rename from mysql-test/t/insert_id_basic.test rename to mysql-test/suite/sys_vars/t/insert_id_basic.test diff --git a/mysql-test/t/insert_id_func.test b/mysql-test/suite/sys_vars/t/insert_id_func.test similarity index 100% rename from mysql-test/t/insert_id_func.test rename to mysql-test/suite/sys_vars/t/insert_id_func.test diff --git a/mysql-test/t/interactive_timeout_basic.test b/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test similarity index 100% rename from mysql-test/t/interactive_timeout_basic.test rename to mysql-test/suite/sys_vars/t/interactive_timeout_basic.test diff --git a/mysql-test/t/interactive_timeout_func.test b/mysql-test/suite/sys_vars/t/interactive_timeout_func.test similarity index 100% rename from mysql-test/t/interactive_timeout_func.test rename to mysql-test/suite/sys_vars/t/interactive_timeout_func.test diff --git a/mysql-test/t/keep_files_on_create_basic.test b/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test similarity index 100% rename from mysql-test/t/keep_files_on_create_basic.test rename to mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test diff --git a/mysql-test/t/key_buffer_size_func.test b/mysql-test/suite/sys_vars/t/key_buffer_size_func.test similarity index 100% rename from mysql-test/t/key_buffer_size_func.test rename to mysql-test/suite/sys_vars/t/key_buffer_size_func.test diff --git a/mysql-test/t/last_insert_id_func-master.opt b/mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt similarity index 100% rename from mysql-test/t/last_insert_id_func-master.opt rename to mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt diff --git a/mysql-test/t/last_insert_id_func.test b/mysql-test/suite/sys_vars/t/last_insert_id_func.test similarity index 100% rename from mysql-test/t/last_insert_id_func.test rename to mysql-test/suite/sys_vars/t/last_insert_id_func.test diff --git a/mysql-test/t/lc_time_names_basic.test b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test similarity index 100% rename from mysql-test/t/lc_time_names_basic.test rename to mysql-test/suite/sys_vars/t/lc_time_names_basic.test diff --git a/mysql-test/t/lc_time_names_func.test b/mysql-test/suite/sys_vars/t/lc_time_names_func.test similarity index 100% rename from mysql-test/t/lc_time_names_func.test rename to mysql-test/suite/sys_vars/t/lc_time_names_func.test diff --git a/mysql-test/t/license_basic.test b/mysql-test/suite/sys_vars/t/license_basic.test similarity index 100% rename from mysql-test/t/license_basic.test rename to mysql-test/suite/sys_vars/t/license_basic.test diff --git a/mysql-test/t/local_infile_basic.test b/mysql-test/suite/sys_vars/t/local_infile_basic.test similarity index 100% rename from mysql-test/t/local_infile_basic.test rename to mysql-test/suite/sys_vars/t/local_infile_basic.test diff --git a/mysql-test/t/local_infile_func.test b/mysql-test/suite/sys_vars/t/local_infile_func.test similarity index 100% rename from mysql-test/t/local_infile_func.test rename to mysql-test/suite/sys_vars/t/local_infile_func.test diff --git a/mysql-test/t/log_basic.test b/mysql-test/suite/sys_vars/t/log_basic.test similarity index 100% rename from mysql-test/t/log_basic.test rename to mysql-test/suite/sys_vars/t/log_basic.test diff --git a/mysql-test/t/log_bin_trust_function_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test similarity index 100% rename from mysql-test/t/log_bin_trust_function_creators_basic.test rename to mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test diff --git a/mysql-test/t/log_bin_trust_function_creators_func-master.opt b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func-master.opt similarity index 100% rename from mysql-test/t/log_bin_trust_function_creators_func-master.opt rename to mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func-master.opt diff --git a/mysql-test/t/log_bin_trust_function_creators_func.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test similarity index 100% rename from mysql-test/t/log_bin_trust_function_creators_func.test rename to mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test diff --git a/mysql-test/t/log_bin_trust_routine_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test similarity index 100% rename from mysql-test/t/log_bin_trust_routine_creators_basic.test rename to mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test diff --git a/mysql-test/t/log_output_basic.test b/mysql-test/suite/sys_vars/t/log_output_basic.test similarity index 100% rename from mysql-test/t/log_output_basic.test rename to mysql-test/suite/sys_vars/t/log_output_basic.test diff --git a/mysql-test/t/log_output_func.test b/mysql-test/suite/sys_vars/t/log_output_func.test similarity index 100% rename from mysql-test/t/log_output_func.test rename to mysql-test/suite/sys_vars/t/log_output_func.test diff --git a/mysql-test/t/log_queries_not_using_indexes_basic.test b/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test similarity index 100% rename from mysql-test/t/log_queries_not_using_indexes_basic.test rename to mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test diff --git a/mysql-test/t/long_query_time_basic.test b/mysql-test/suite/sys_vars/t/long_query_time_basic.test similarity index 100% rename from mysql-test/t/long_query_time_basic.test rename to mysql-test/suite/sys_vars/t/long_query_time_basic.test diff --git a/mysql-test/t/low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test similarity index 100% rename from mysql-test/t/low_priority_updates_basic.test rename to mysql-test/suite/sys_vars/t/low_priority_updates_basic.test diff --git a/mysql-test/t/max_allowed_packet_basic.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test similarity index 100% rename from mysql-test/t/max_allowed_packet_basic.test rename to mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test diff --git a/mysql-test/t/max_allowed_packet_func.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test similarity index 100% rename from mysql-test/t/max_allowed_packet_func.test rename to mysql-test/suite/sys_vars/t/max_allowed_packet_func.test diff --git a/mysql-test/t/max_binlog_cache_size_func-master.opt b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt similarity index 100% rename from mysql-test/t/max_binlog_cache_size_func-master.opt rename to mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt diff --git a/mysql-test/t/max_binlog_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test similarity index 100% rename from mysql-test/t/max_binlog_size_basic.test rename to mysql-test/suite/sys_vars/t/max_binlog_size_basic.test diff --git a/mysql-test/t/max_connections_basic.test b/mysql-test/suite/sys_vars/t/max_connections_basic.test similarity index 100% rename from mysql-test/t/max_connections_basic.test rename to mysql-test/suite/sys_vars/t/max_connections_basic.test diff --git a/mysql-test/t/max_delayed_threads_basic.test b/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test similarity index 100% rename from mysql-test/t/max_delayed_threads_basic.test rename to mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test diff --git a/mysql-test/t/max_error_count_basic.test b/mysql-test/suite/sys_vars/t/max_error_count_basic.test similarity index 100% rename from mysql-test/t/max_error_count_basic.test rename to mysql-test/suite/sys_vars/t/max_error_count_basic.test diff --git a/mysql-test/t/max_insert_delayed_threads_basic.test b/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test similarity index 100% rename from mysql-test/t/max_insert_delayed_threads_basic.test rename to mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test diff --git a/mysql-test/t/max_join_size_func.test b/mysql-test/suite/sys_vars/t/max_join_size_func.test similarity index 100% rename from mysql-test/t/max_join_size_func.test rename to mysql-test/suite/sys_vars/t/max_join_size_func.test diff --git a/mysql-test/t/max_length_for_sort_data_basic.test b/mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test similarity index 100% rename from mysql-test/t/max_length_for_sort_data_basic.test rename to mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test diff --git a/mysql-test/t/max_prepared_stmt_count_basic.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test similarity index 100% rename from mysql-test/t/max_prepared_stmt_count_basic.test rename to mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test diff --git a/mysql-test/t/max_prepared_stmt_count_func.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test similarity index 100% rename from mysql-test/t/max_prepared_stmt_count_func.test rename to mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test diff --git a/mysql-test/t/max_relay_log_size_basic.test b/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test similarity index 100% rename from mysql-test/t/max_relay_log_size_basic.test rename to mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test diff --git a/mysql-test/t/max_seeks_for_key_func.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test similarity index 100% rename from mysql-test/t/max_seeks_for_key_func.test rename to mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test diff --git a/mysql-test/t/max_sort_length_basic.test b/mysql-test/suite/sys_vars/t/max_sort_length_basic.test similarity index 100% rename from mysql-test/t/max_sort_length_basic.test rename to mysql-test/suite/sys_vars/t/max_sort_length_basic.test diff --git a/mysql-test/t/max_sort_length_func.test b/mysql-test/suite/sys_vars/t/max_sort_length_func.test similarity index 100% rename from mysql-test/t/max_sort_length_func.test rename to mysql-test/suite/sys_vars/t/max_sort_length_func.test diff --git a/mysql-test/t/max_sp_recursion_depth_basic.test b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test similarity index 100% rename from mysql-test/t/max_sp_recursion_depth_basic.test rename to mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test diff --git a/mysql-test/t/max_sp_recursion_depth_func.test b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test similarity index 100% rename from mysql-test/t/max_sp_recursion_depth_func.test rename to mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test diff --git a/mysql-test/t/max_user_connections_basic.test b/mysql-test/suite/sys_vars/t/max_user_connections_basic.test similarity index 100% rename from mysql-test/t/max_user_connections_basic.test rename to mysql-test/suite/sys_vars/t/max_user_connections_basic.test diff --git a/mysql-test/t/max_user_connections_func.test b/mysql-test/suite/sys_vars/t/max_user_connections_func.test similarity index 100% rename from mysql-test/t/max_user_connections_func.test rename to mysql-test/suite/sys_vars/t/max_user_connections_func.test diff --git a/mysql-test/t/myisam_data_pointer_size_basic.test b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test similarity index 100% rename from mysql-test/t/myisam_data_pointer_size_basic.test rename to mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test diff --git a/mysql-test/t/myisam_data_pointer_size_func.test b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test similarity index 100% rename from mysql-test/t/myisam_data_pointer_size_func.test rename to mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test diff --git a/mysql-test/t/myisam_stats_method_basic.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test similarity index 100% rename from mysql-test/t/myisam_stats_method_basic.test rename to mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test diff --git a/mysql-test/t/myisam_stats_method_func.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test similarity index 100% rename from mysql-test/t/myisam_stats_method_func.test rename to mysql-test/suite/sys_vars/t/myisam_stats_method_func.test diff --git a/mysql-test/t/myisam_use_mmap_basic.test b/mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test similarity index 100% rename from mysql-test/t/myisam_use_mmap_basic.test rename to mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test diff --git a/mysql-test/t/ndb_log_update_as_write_basic.test b/mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test similarity index 100% rename from mysql-test/t/ndb_log_update_as_write_basic.test rename to mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test diff --git a/mysql-test/t/ndb_log_updated_only_basic.test b/mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test similarity index 100% rename from mysql-test/t/ndb_log_updated_only_basic.test rename to mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test diff --git a/mysql-test/t/net_buffer_length_basic.test b/mysql-test/suite/sys_vars/t/net_buffer_length_basic.test similarity index 100% rename from mysql-test/t/net_buffer_length_basic.test rename to mysql-test/suite/sys_vars/t/net_buffer_length_basic.test diff --git a/mysql-test/t/net_read_timeout_basic.test b/mysql-test/suite/sys_vars/t/net_read_timeout_basic.test similarity index 100% rename from mysql-test/t/net_read_timeout_basic.test rename to mysql-test/suite/sys_vars/t/net_read_timeout_basic.test diff --git a/mysql-test/t/net_write_timeout_basic.test b/mysql-test/suite/sys_vars/t/net_write_timeout_basic.test similarity index 100% rename from mysql-test/t/net_write_timeout_basic.test rename to mysql-test/suite/sys_vars/t/net_write_timeout_basic.test diff --git a/mysql-test/t/new_basic.test b/mysql-test/suite/sys_vars/t/new_basic.test similarity index 100% rename from mysql-test/t/new_basic.test rename to mysql-test/suite/sys_vars/t/new_basic.test diff --git a/mysql-test/t/old_passwords_basic.test b/mysql-test/suite/sys_vars/t/old_passwords_basic.test similarity index 100% rename from mysql-test/t/old_passwords_basic.test rename to mysql-test/suite/sys_vars/t/old_passwords_basic.test diff --git a/mysql-test/t/old_passwords_func.test b/mysql-test/suite/sys_vars/t/old_passwords_func.test similarity index 100% rename from mysql-test/t/old_passwords_func.test rename to mysql-test/suite/sys_vars/t/old_passwords_func.test diff --git a/mysql-test/t/optimizer_prune_level_basic.test b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test similarity index 100% rename from mysql-test/t/optimizer_prune_level_basic.test rename to mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test diff --git a/mysql-test/t/optimizer_search_depth_basic.test b/mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test similarity index 100% rename from mysql-test/t/optimizer_search_depth_basic.test rename to mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test diff --git a/mysql-test/t/preload_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test similarity index 100% rename from mysql-test/t/preload_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test diff --git a/mysql-test/t/query_cache_limit_func.test b/mysql-test/suite/sys_vars/t/query_cache_limit_func.test similarity index 100% rename from mysql-test/t/query_cache_limit_func.test rename to mysql-test/suite/sys_vars/t/query_cache_limit_func.test diff --git a/mysql-test/t/query_cache_type_basic.test b/mysql-test/suite/sys_vars/t/query_cache_type_basic.test similarity index 100% rename from mysql-test/t/query_cache_type_basic.test rename to mysql-test/suite/sys_vars/t/query_cache_type_basic.test diff --git a/mysql-test/t/query_cache_type_func.test b/mysql-test/suite/sys_vars/t/query_cache_type_func.test similarity index 100% rename from mysql-test/t/query_cache_type_func.test rename to mysql-test/suite/sys_vars/t/query_cache_type_func.test diff --git a/mysql-test/t/query_cache_wlock_invalidate_basic.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test similarity index 100% rename from mysql-test/t/query_cache_wlock_invalidate_basic.test rename to mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test diff --git a/mysql-test/t/query_cache_wlock_invalidate_func.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test similarity index 100% rename from mysql-test/t/query_cache_wlock_invalidate_func.test rename to mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test diff --git a/mysql-test/t/query_prealloc_size_func.test b/mysql-test/suite/sys_vars/t/query_prealloc_size_func.test similarity index 100% rename from mysql-test/t/query_prealloc_size_func.test rename to mysql-test/suite/sys_vars/t/query_prealloc_size_func.test diff --git a/mysql-test/t/read_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/read_buffer_size_basic.test similarity index 100% rename from mysql-test/t/read_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/read_buffer_size_basic.test diff --git a/mysql-test/t/read_only_basic.test b/mysql-test/suite/sys_vars/t/read_only_basic.test similarity index 100% rename from mysql-test/t/read_only_basic.test rename to mysql-test/suite/sys_vars/t/read_only_basic.test diff --git a/mysql-test/t/read_only_func.test b/mysql-test/suite/sys_vars/t/read_only_func.test similarity index 100% rename from mysql-test/t/read_only_func.test rename to mysql-test/suite/sys_vars/t/read_only_func.test diff --git a/mysql-test/t/read_rnd_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test similarity index 100% rename from mysql-test/t/read_rnd_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test diff --git a/mysql-test/t/relay_log_purge_basic.test b/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test similarity index 100% rename from mysql-test/t/relay_log_purge_basic.test rename to mysql-test/suite/sys_vars/t/relay_log_purge_basic.test diff --git a/mysql-test/t/rpl_init_slave_func-slave.opt b/mysql-test/suite/sys_vars/t/rpl_init_slave_func-slave.opt similarity index 100% rename from mysql-test/t/rpl_init_slave_func-slave.opt rename to mysql-test/suite/sys_vars/t/rpl_init_slave_func-slave.opt diff --git a/mysql-test/t/rpl_init_slave_func.test b/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test similarity index 100% rename from mysql-test/t/rpl_init_slave_func.test rename to mysql-test/suite/sys_vars/t/rpl_init_slave_func.test diff --git a/mysql-test/t/rpl_max_binlog_size_func-master.opt b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt similarity index 100% rename from mysql-test/t/rpl_max_binlog_size_func-master.opt rename to mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt diff --git a/mysql-test/t/rpl_max_binlog_size_func.test b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test similarity index 98% rename from mysql-test/t/rpl_max_binlog_size_func.test rename to mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test index df22b253009..d9b8d936506 100644 --- a/mysql-test/t/rpl_max_binlog_size_func.test +++ b/mysql-test/suite/sys_vars/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 # ############################################################################### diff --git a/mysql-test/t/secure_auth_basic.test b/mysql-test/suite/sys_vars/t/secure_auth_basic.test similarity index 100% rename from mysql-test/t/secure_auth_basic.test rename to mysql-test/suite/sys_vars/t/secure_auth_basic.test diff --git a/mysql-test/t/secure_auth_func-master.opt b/mysql-test/suite/sys_vars/t/secure_auth_func-master.opt similarity index 100% rename from mysql-test/t/secure_auth_func-master.opt rename to mysql-test/suite/sys_vars/t/secure_auth_func-master.opt diff --git a/mysql-test/t/secure_auth_func.test b/mysql-test/suite/sys_vars/t/secure_auth_func.test similarity index 100% rename from mysql-test/t/secure_auth_func.test rename to mysql-test/suite/sys_vars/t/secure_auth_func.test diff --git a/mysql-test/t/slave_allow_batching_basic.test b/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test similarity index 100% rename from mysql-test/t/slave_allow_batching_basic.test rename to mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test diff --git a/mysql-test/t/slave_compressed_protocol_basic.test b/mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test similarity index 100% rename from mysql-test/t/slave_compressed_protocol_basic.test rename to mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test diff --git a/mysql-test/t/slave_exec_mode_basic.test b/mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test similarity index 100% rename from mysql-test/t/slave_exec_mode_basic.test rename to mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test diff --git a/mysql-test/t/slave_net_timeout_basic.test b/mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test similarity index 100% rename from mysql-test/t/slave_net_timeout_basic.test rename to mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test diff --git a/mysql-test/t/slow_launch_time_basic.test b/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test similarity index 100% rename from mysql-test/t/slow_launch_time_basic.test rename to mysql-test/suite/sys_vars/t/slow_launch_time_basic.test diff --git a/mysql-test/t/slow_launch_time_func.test b/mysql-test/suite/sys_vars/t/slow_launch_time_func.test similarity index 100% rename from mysql-test/t/slow_launch_time_func.test rename to mysql-test/suite/sys_vars/t/slow_launch_time_func.test diff --git a/mysql-test/t/slow_query_log_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_basic.test similarity index 100% rename from mysql-test/t/slow_query_log_basic.test rename to mysql-test/suite/sys_vars/t/slow_query_log_basic.test diff --git a/mysql-test/t/slow_query_log_file_basic-master.opt b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt similarity index 100% rename from mysql-test/t/slow_query_log_file_basic-master.opt rename to mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt diff --git a/mysql-test/t/slow_query_log_file_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test similarity index 100% rename from mysql-test/t/slow_query_log_file_basic.test rename to mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test diff --git a/mysql-test/t/slow_query_log_file_func-master.opt b/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt similarity index 100% rename from mysql-test/t/slow_query_log_file_func-master.opt rename to mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt diff --git a/mysql-test/t/slow_query_log_file_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_func.test similarity index 100% rename from mysql-test/t/slow_query_log_file_func.test rename to mysql-test/suite/sys_vars/t/slow_query_log_file_func.test diff --git a/mysql-test/t/slow_query_log_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_func.test similarity index 100% rename from mysql-test/t/slow_query_log_func.test rename to mysql-test/suite/sys_vars/t/slow_query_log_func.test diff --git a/mysql-test/t/sql_auto_is_null_basic.test b/mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test similarity index 100% rename from mysql-test/t/sql_auto_is_null_basic.test rename to mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test diff --git a/mysql-test/t/sql_big_selects_basic.test b/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test similarity index 100% rename from mysql-test/t/sql_big_selects_basic.test rename to mysql-test/suite/sys_vars/t/sql_big_selects_basic.test diff --git a/mysql-test/t/sql_big_selects_func.test b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test similarity index 100% rename from mysql-test/t/sql_big_selects_func.test rename to mysql-test/suite/sys_vars/t/sql_big_selects_func.test diff --git a/mysql-test/t/sql_big_tables_basic.test b/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test similarity index 100% rename from mysql-test/t/sql_big_tables_basic.test rename to mysql-test/suite/sys_vars/t/sql_big_tables_basic.test diff --git a/mysql-test/t/sql_big_tables_func.test b/mysql-test/suite/sys_vars/t/sql_big_tables_func.test similarity index 100% rename from mysql-test/t/sql_big_tables_func.test rename to mysql-test/suite/sys_vars/t/sql_big_tables_func.test diff --git a/mysql-test/t/sql_buffer_result_basic.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test similarity index 100% rename from mysql-test/t/sql_buffer_result_basic.test rename to mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test diff --git a/mysql-test/t/sql_buffer_result_func.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_func.test similarity index 100% rename from mysql-test/t/sql_buffer_result_func.test rename to mysql-test/suite/sys_vars/t/sql_buffer_result_func.test diff --git a/mysql-test/t/sql_log_bin_basic.test b/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test similarity index 100% rename from mysql-test/t/sql_log_bin_basic.test rename to mysql-test/suite/sys_vars/t/sql_log_bin_basic.test diff --git a/mysql-test/t/sql_log_off_basic.test b/mysql-test/suite/sys_vars/t/sql_log_off_basic.test similarity index 100% rename from mysql-test/t/sql_log_off_basic.test rename to mysql-test/suite/sys_vars/t/sql_log_off_basic.test diff --git a/mysql-test/t/sql_log_off_func.test b/mysql-test/suite/sys_vars/t/sql_log_off_func.test similarity index 100% rename from mysql-test/t/sql_log_off_func.test rename to mysql-test/suite/sys_vars/t/sql_log_off_func.test diff --git a/mysql-test/t/sql_low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test similarity index 100% rename from mysql-test/t/sql_low_priority_updates_basic.test rename to mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test diff --git a/mysql-test/t/sql_low_priority_updates_func.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test similarity index 100% rename from mysql-test/t/sql_low_priority_updates_func.test rename to mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test diff --git a/mysql-test/t/sql_max_join_size_func.test b/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test similarity index 100% rename from mysql-test/t/sql_max_join_size_func.test rename to mysql-test/suite/sys_vars/t/sql_max_join_size_func.test diff --git a/mysql-test/t/sql_mode_basic.test b/mysql-test/suite/sys_vars/t/sql_mode_basic.test similarity index 100% rename from mysql-test/t/sql_mode_basic.test rename to mysql-test/suite/sys_vars/t/sql_mode_basic.test diff --git a/mysql-test/t/sql_mode_func.test b/mysql-test/suite/sys_vars/t/sql_mode_func.test similarity index 100% rename from mysql-test/t/sql_mode_func.test rename to mysql-test/suite/sys_vars/t/sql_mode_func.test diff --git a/mysql-test/t/sql_notes_basic.test b/mysql-test/suite/sys_vars/t/sql_notes_basic.test similarity index 100% rename from mysql-test/t/sql_notes_basic.test rename to mysql-test/suite/sys_vars/t/sql_notes_basic.test diff --git a/mysql-test/t/sql_notes_func.test b/mysql-test/suite/sys_vars/t/sql_notes_func.test similarity index 100% rename from mysql-test/t/sql_notes_func.test rename to mysql-test/suite/sys_vars/t/sql_notes_func.test diff --git a/mysql-test/t/sql_quote_show_create_basic.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test similarity index 100% rename from mysql-test/t/sql_quote_show_create_basic.test rename to mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test diff --git a/mysql-test/t/sql_quote_show_create_func.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test similarity index 100% rename from mysql-test/t/sql_quote_show_create_func.test rename to mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test diff --git a/mysql-test/t/sql_safe_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test similarity index 100% rename from mysql-test/t/sql_safe_updates_basic.test rename to mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test diff --git a/mysql-test/t/sql_safe_updates_func.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test similarity index 100% rename from mysql-test/t/sql_safe_updates_func.test rename to mysql-test/suite/sys_vars/t/sql_safe_updates_func.test diff --git a/mysql-test/t/sql_select_limit_func.test b/mysql-test/suite/sys_vars/t/sql_select_limit_func.test similarity index 100% rename from mysql-test/t/sql_select_limit_func.test rename to mysql-test/suite/sys_vars/t/sql_select_limit_func.test diff --git a/mysql-test/t/sql_slave_skip_counter_basic.test b/mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test similarity index 100% rename from mysql-test/t/sql_slave_skip_counter_basic.test rename to mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test diff --git a/mysql-test/t/sql_warnings_basic.test b/mysql-test/suite/sys_vars/t/sql_warnings_basic.test similarity index 100% rename from mysql-test/t/sql_warnings_basic.test rename to mysql-test/suite/sys_vars/t/sql_warnings_basic.test diff --git a/mysql-test/t/sql_warnings_func.test b/mysql-test/suite/sys_vars/t/sql_warnings_func.test similarity index 100% rename from mysql-test/t/sql_warnings_func.test rename to mysql-test/suite/sys_vars/t/sql_warnings_func.test diff --git a/mysql-test/t/ssl_ca_basic.test b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test similarity index 100% rename from mysql-test/t/ssl_ca_basic.test rename to mysql-test/suite/sys_vars/t/ssl_ca_basic.test diff --git a/mysql-test/t/ssl_capath_basic.test b/mysql-test/suite/sys_vars/t/ssl_capath_basic.test similarity index 100% rename from mysql-test/t/ssl_capath_basic.test rename to mysql-test/suite/sys_vars/t/ssl_capath_basic.test diff --git a/mysql-test/t/ssl_cert_basic.test b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test similarity index 100% rename from mysql-test/t/ssl_cert_basic.test rename to mysql-test/suite/sys_vars/t/ssl_cert_basic.test diff --git a/mysql-test/t/ssl_cipher_basic.test b/mysql-test/suite/sys_vars/t/ssl_cipher_basic.test similarity index 100% rename from mysql-test/t/ssl_cipher_basic.test rename to mysql-test/suite/sys_vars/t/ssl_cipher_basic.test diff --git a/mysql-test/t/ssl_key_basic.test b/mysql-test/suite/sys_vars/t/ssl_key_basic.test similarity index 100% rename from mysql-test/t/ssl_key_basic.test rename to mysql-test/suite/sys_vars/t/ssl_key_basic.test diff --git a/mysql-test/t/storage_engine_basic-master.opt b/mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt similarity index 100% rename from mysql-test/t/storage_engine_basic-master.opt rename to mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt diff --git a/mysql-test/t/storage_engine_basic.test b/mysql-test/suite/sys_vars/t/storage_engine_basic.test similarity index 100% rename from mysql-test/t/storage_engine_basic.test rename to mysql-test/suite/sys_vars/t/storage_engine_basic.test diff --git a/mysql-test/t/sync_frm_basic.test b/mysql-test/suite/sys_vars/t/sync_frm_basic.test similarity index 100% rename from mysql-test/t/sync_frm_basic.test rename to mysql-test/suite/sys_vars/t/sync_frm_basic.test diff --git a/mysql-test/t/system_time_zone_basic.test b/mysql-test/suite/sys_vars/t/system_time_zone_basic.test similarity index 100% rename from mysql-test/t/system_time_zone_basic.test rename to mysql-test/suite/sys_vars/t/system_time_zone_basic.test diff --git a/mysql-test/t/table_definition_cache_basic.test b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test similarity index 100% rename from mysql-test/t/table_definition_cache_basic.test rename to mysql-test/suite/sys_vars/t/table_definition_cache_basic.test diff --git a/mysql-test/t/table_lock_wait_timeout_basic.test b/mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test similarity index 100% rename from mysql-test/t/table_lock_wait_timeout_basic.test rename to mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test diff --git a/mysql-test/t/table_open_cache_basic.test b/mysql-test/suite/sys_vars/t/table_open_cache_basic.test similarity index 100% rename from mysql-test/t/table_open_cache_basic.test rename to mysql-test/suite/sys_vars/t/table_open_cache_basic.test diff --git a/mysql-test/t/thread_cache_size_func.test b/mysql-test/suite/sys_vars/t/thread_cache_size_func.test similarity index 100% rename from mysql-test/t/thread_cache_size_func.test rename to mysql-test/suite/sys_vars/t/thread_cache_size_func.test diff --git a/mysql-test/t/thread_handling_basic.test b/mysql-test/suite/sys_vars/t/thread_handling_basic.test similarity index 100% rename from mysql-test/t/thread_handling_basic.test rename to mysql-test/suite/sys_vars/t/thread_handling_basic.test diff --git a/mysql-test/t/time_zone_basic.test b/mysql-test/suite/sys_vars/t/time_zone_basic.test similarity index 100% rename from mysql-test/t/time_zone_basic.test rename to mysql-test/suite/sys_vars/t/time_zone_basic.test diff --git a/mysql-test/t/time_zone_func.test b/mysql-test/suite/sys_vars/t/time_zone_func.test similarity index 100% rename from mysql-test/t/time_zone_func.test rename to mysql-test/suite/sys_vars/t/time_zone_func.test diff --git a/mysql-test/t/timed_mutexes_basic.test b/mysql-test/suite/sys_vars/t/timed_mutexes_basic.test similarity index 100% rename from mysql-test/t/timed_mutexes_basic.test rename to mysql-test/suite/sys_vars/t/timed_mutexes_basic.test diff --git a/mysql-test/t/timestamp_func.test b/mysql-test/suite/sys_vars/t/timestamp_func.test similarity index 100% rename from mysql-test/t/timestamp_func.test rename to mysql-test/suite/sys_vars/t/timestamp_func.test diff --git a/mysql-test/t/timestamp_sysdate_is_now_func-master.opt b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt similarity index 100% rename from mysql-test/t/timestamp_sysdate_is_now_func-master.opt rename to mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt diff --git a/mysql-test/t/timestamp_sysdate_is_now_func.test b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test similarity index 100% rename from mysql-test/t/timestamp_sysdate_is_now_func.test rename to mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test diff --git a/mysql-test/t/tmpdir_basic.test b/mysql-test/suite/sys_vars/t/tmpdir_basic.test similarity index 100% rename from mysql-test/t/tmpdir_basic.test rename to mysql-test/suite/sys_vars/t/tmpdir_basic.test diff --git a/mysql-test/t/tx_isolation_basic.test b/mysql-test/suite/sys_vars/t/tx_isolation_basic.test similarity index 100% rename from mysql-test/t/tx_isolation_basic.test rename to mysql-test/suite/sys_vars/t/tx_isolation_basic.test diff --git a/mysql-test/t/tx_isolation_func-master.opt b/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt similarity index 100% rename from mysql-test/t/tx_isolation_func-master.opt rename to mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt diff --git a/mysql-test/t/tx_isolation_func.test b/mysql-test/suite/sys_vars/t/tx_isolation_func.test similarity index 100% rename from mysql-test/t/tx_isolation_func.test rename to mysql-test/suite/sys_vars/t/tx_isolation_func.test diff --git a/mysql-test/t/unique_checks_basic.test b/mysql-test/suite/sys_vars/t/unique_checks_basic.test similarity index 100% rename from mysql-test/t/unique_checks_basic.test rename to mysql-test/suite/sys_vars/t/unique_checks_basic.test diff --git a/mysql-test/t/updatable_views_with_limit_basic.test b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test similarity index 100% rename from mysql-test/t/updatable_views_with_limit_basic.test rename to mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test diff --git a/mysql-test/t/updatable_views_with_limit_func.test b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test similarity index 100% rename from mysql-test/t/updatable_views_with_limit_func.test rename to mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test diff --git a/mysql-test/t/version_basic.test b/mysql-test/suite/sys_vars/t/version_basic.test similarity index 100% rename from mysql-test/t/version_basic.test rename to mysql-test/suite/sys_vars/t/version_basic.test diff --git a/mysql-test/t/version_comment_basic.test b/mysql-test/suite/sys_vars/t/version_comment_basic.test similarity index 100% rename from mysql-test/t/version_comment_basic.test rename to mysql-test/suite/sys_vars/t/version_comment_basic.test diff --git a/mysql-test/t/version_compile_machine_basic.test b/mysql-test/suite/sys_vars/t/version_compile_machine_basic.test similarity index 100% rename from mysql-test/t/version_compile_machine_basic.test rename to mysql-test/suite/sys_vars/t/version_compile_machine_basic.test diff --git a/mysql-test/t/version_compile_os_basic.test b/mysql-test/suite/sys_vars/t/version_compile_os_basic.test similarity index 100% rename from mysql-test/t/version_compile_os_basic.test rename to mysql-test/suite/sys_vars/t/version_compile_os_basic.test diff --git a/mysql-test/t/wait_timeout_func.test b/mysql-test/suite/sys_vars/t/wait_timeout_func.test similarity index 100% rename from mysql-test/t/wait_timeout_func.test rename to mysql-test/suite/sys_vars/t/wait_timeout_func.test diff --git a/mysql-test/t/warning_count_basic.test b/mysql-test/suite/sys_vars/t/warning_count_basic.test similarity index 100% rename from mysql-test/t/warning_count_basic.test rename to mysql-test/suite/sys_vars/t/warning_count_basic.test From 357b5009409ed6666bf1df48a80d76cd42a482c8 Mon Sep 17 00:00:00 2001 From: Horst Hunger Date: Fri, 19 Dec 2008 16:03:32 +0100 Subject: [PATCH 2/2] WL#4681: Took the system variable tests out of the main test suite, put them into "sys_vars", updated some reult files and tests. --- .../sys_vars/inc}/charset_basic.inc | 0 .../sys_vars/inc}/collation_basic.inc | 0 .../suite/sys_vars/inc/query_cache_size_basic.inc | 4 +--- mysql-test/suite/sys_vars/inc/timestamp_basic.inc | 11 ++++++----- .../{ => suite/sys_vars}/r/auto_commit_basic.result | 0 .../r/auto_increment_increment_basic.result | 0 .../r/auto_increment_increment_func.result | 0 .../sys_vars}/r/auto_increment_offset_basic.result | 0 .../sys_vars}/r/auto_increment_offset_func.result | 0 .../{ => suite/sys_vars}/r/autocommit_func.result | 0 .../r/automatic_sp_privileges_basic.result | 0 .../sys_vars}/r/automatic_sp_privileges_func.result | 0 .../{ => suite/sys_vars}/r/basedir_basic.result | 0 .../{ => suite/sys_vars}/r/big_tables_basic.result | 0 .../sys_vars}/r/binlog_format_basic.result | 0 .../sys_vars}/r/character_set_client_basic.result | 0 .../sys_vars}/r/character_set_client_func.result | 0 .../r/character_set_connection_basic.result | 0 .../r/character_set_connection_func.result | 0 .../sys_vars}/r/character_set_database_basic.result | 0 .../sys_vars}/r/character_set_database_func.result | 0 .../r/character_set_filesystem_basic.result | 0 .../sys_vars}/r/character_set_results_basic.result | Bin .../sys_vars}/r/character_set_results_func.result | 0 .../sys_vars}/r/character_set_server_basic.result | 0 .../sys_vars}/r/character_set_server_func.result | 0 .../sys_vars}/r/character_set_system_basic.result | 0 .../sys_vars}/r/collation_connection_basic.result | 0 .../sys_vars}/r/collation_connection_func.result | 0 .../sys_vars}/r/collation_database_basic.result | 0 .../sys_vars}/r/collation_database_func.result | 0 .../sys_vars}/r/collation_server_basic.result | 0 .../sys_vars}/r/collation_server_func.result | 0 .../sys_vars}/r/completion_type_basic.result | 0 .../sys_vars}/r/completion_type_func.result | 0 .../sys_vars}/r/concurrent_insert_basic.result | 0 .../sys_vars}/r/concurrent_insert_func.result | 0 .../sys_vars}/r/connect_timeout_basic.result | 0 .../{ => suite/sys_vars}/r/datadir_basic.result | 0 .../sys_vars}/r/default_week_format_basic.result | 0 .../sys_vars}/r/default_week_format_func.result | 0 .../sys_vars}/r/delay_key_write_basic.result | 0 .../sys_vars}/r/delay_key_write_func.result | 0 .../sys_vars}/r/delayed_insert_limit_func.result | 0 .../sys_vars}/r/delayed_insert_timeout_basic.result | 0 .../r/div_precision_increment_basic.result | 0 .../sys_vars}/r/div_precision_increment_func.result | 0 .../r/engine_condition_pushdown_basic.result | 0 .../{ => suite/sys_vars}/r/error_count_basic.result | 0 .../sys_vars}/r/event_scheduler_basic.result | 0 .../sys_vars}/r/event_scheduler_func.result | 0 .../sys_vars}/r/expire_logs_days_basic.result | 0 .../{ => suite/sys_vars}/r/flush_basic.result | 0 .../sys_vars}/r/foreign_key_checks_basic.result | 0 .../sys_vars}/r/foreign_key_checks_func.result | 0 .../sys_vars}/r/ft_boolean_syntax_basic.result | 0 .../sys_vars}/r/ft_boolean_syntax_func.result | 0 .../{ => suite/sys_vars}/r/general_log_basic.result | 0 .../sys_vars}/r/general_log_file_basic.result | 0 .../sys_vars}/r/general_log_file_func.result | 0 .../{ => suite/sys_vars}/r/general_log_func.result | 0 .../sys_vars}/r/group_concat_max_len_basic.result | 0 .../sys_vars}/r/group_concat_max_len_func.result | 0 .../sys_vars}/r/have_compress_basic.result | 0 .../{ => suite/sys_vars}/r/have_crypt_basic.result | 0 .../{ => suite/sys_vars}/r/have_csv_basic.result | 0 .../sys_vars}/r/have_dynamic_loading_basic.result | 0 .../sys_vars}/r/have_geometry_basic.result | 0 .../{ => suite/sys_vars}/r/have_innodb_basic.result | 0 .../sys_vars}/r/have_ndbcluster_basic.result | 0 .../sys_vars}/r/have_openssl_basic.result | 0 .../sys_vars}/r/have_partitioning_basic.result | 0 .../sys_vars}/r/have_query_cache_basic.result | 0 .../sys_vars}/r/have_rtree_keys_basic.result | 0 .../{ => suite/sys_vars}/r/have_ssl_basic.result | 0 .../sys_vars}/r/have_symlink_basic.result | 0 .../{ => suite/sys_vars}/r/hostname_basic.result | 0 .../{ => suite/sys_vars}/r/identity_basic.result | 0 .../{ => suite/sys_vars}/r/identity_func.result | 0 .../sys_vars}/r/init_connect_basic.result | 0 .../{ => suite/sys_vars}/r/init_slave_basic.result | 0 .../r/innodb_additional_mem_pool_size_basic.result | 0 .../r/innodb_autoextend_increment_basic.result | 0 .../r/innodb_autoinc_lock_mode_basic.result | 0 .../r/innodb_autoinc_lock_mode_func.result | 0 .../r/innodb_buffer_pool_size_basic.result | 0 .../sys_vars}/r/innodb_checksums_basic.result | 0 .../r/innodb_commit_concurrency_basic.result | 0 .../sys_vars}/r/innodb_data_file_path_basic.result | 0 .../sys_vars}/r/innodb_data_home_dir_basic.result | 0 .../sys_vars}/r/innodb_doublewrite_basic.result | 0 .../sys_vars}/r/innodb_fast_shutdown_basic.result | 0 .../sys_vars}/r/innodb_file_io_threads_basic.result | 0 .../sys_vars}/r/innodb_file_per_table_basic.result | 0 .../r/innodb_flush_log_at_trx_commit_basic.result | 0 .../sys_vars}/r/innodb_flush_method_basic.result | 0 .../sys_vars}/r/innodb_force_recovery_basic.result | 0 .../r/innodb_lock_wait_timeout_basic.result | 0 .../r/innodb_locks_unsafe_for_binlog_basic.result | 0 .../sys_vars}/r/innodb_log_buffer_size_basic.result | 0 .../sys_vars}/r/innodb_log_file_size_basic.result | 0 .../r/innodb_log_files_in_group_basic.result | 0 .../r/innodb_log_group_home_dir_basic.result | 0 .../r/innodb_max_dirty_pages_pct_basic.result | 0 .../r/innodb_max_dirty_pages_pct_func.result | 0 .../r/innodb_mirrored_log_groups_basic.result | 0 .../sys_vars}/r/innodb_open_files_basic.result | 0 .../r/innodb_rollback_on_timeout_basic.result | 0 .../sys_vars}/r/innodb_support_xa_basic.result | 0 .../sys_vars}/r/innodb_support_xa_func.result | 0 .../sys_vars}/r/innodb_table_locks_basic.result | 0 .../sys_vars}/r/innodb_table_locks_func.result | 0 .../r/innodb_thread_concurrency_basic.result | 0 .../r/innodb_thread_sleep_delay_basic.result | 0 .../{ => suite/sys_vars}/r/insert_id_basic.result | 0 .../{ => suite/sys_vars}/r/insert_id_func.result | 0 .../sys_vars}/r/interactive_timeout_basic.result | 0 .../sys_vars}/r/interactive_timeout_func.result | 0 .../sys_vars}/r/keep_files_on_create_basic.result | 0 .../sys_vars}/r/key_buffer_size_func.result | 0 .../sys_vars}/r/last_insert_id_func.result | 0 .../sys_vars}/r/lc_time_names_basic.result | 0 .../sys_vars}/r/lc_time_names_func.result | 0 .../{ => suite/sys_vars}/r/license_basic.result | 0 .../sys_vars}/r/local_infile_basic.result | 0 .../{ => suite/sys_vars}/r/local_infile_func.result | 0 mysql-test/{ => suite/sys_vars}/r/log_basic.result | 0 .../r/log_bin_trust_function_creators_basic.result | 0 .../r/log_bin_trust_function_creators_func.result | 0 .../r/log_bin_trust_routine_creators_basic.result | 0 .../{ => suite/sys_vars}/r/log_output_basic.result | 0 .../{ => suite/sys_vars}/r/log_output_func.result | 0 .../r/log_queries_not_using_indexes_basic.result | 0 .../sys_vars}/r/long_query_time_basic.result | 0 .../sys_vars}/r/low_priority_updates_basic.result | 0 .../sys_vars}/r/max_allowed_packet_basic.result | 0 .../sys_vars}/r/max_allowed_packet_func.result | 0 .../sys_vars}/r/max_binlog_cache_size_func.result | 0 .../sys_vars}/r/max_binlog_size_basic.result | 0 .../sys_vars}/r/max_connections_basic.result | 0 .../sys_vars}/r/max_delayed_threads_basic.result | 0 .../sys_vars}/r/max_error_count_basic.result | 0 .../r/max_insert_delayed_threads_basic.result | 0 .../sys_vars}/r/max_join_size_func.result | 0 .../r/max_length_for_sort_data_basic.result | 0 .../r/max_prepared_stmt_count_basic.result | 0 .../sys_vars}/r/max_prepared_stmt_count_func.result | 0 .../sys_vars}/r/max_relay_log_size_basic.result | 0 .../sys_vars}/r/max_seeks_for_key_func.result | 0 .../sys_vars}/r/max_sort_length_basic.result | 0 .../sys_vars}/r/max_sort_length_func.result | 0 .../sys_vars}/r/max_sp_recursion_depth_basic.result | 0 .../sys_vars}/r/max_sp_recursion_depth_func.result | 0 .../sys_vars}/r/max_user_connections_basic.result | 0 .../sys_vars}/r/max_user_connections_func.result | 0 .../r/myisam_data_pointer_size_basic.result | 0 .../r/myisam_data_pointer_size_func.result | 0 .../r/myisam_sort_buffer_size_basic.result | 0 .../sys_vars}/r/myisam_stats_method_basic.result | 0 .../sys_vars}/r/myisam_stats_method_func.result | 0 .../sys_vars}/r/myisam_use_mmap_basic.result | 0 .../r/ndb_log_update_as_write_basic.result | 0 .../sys_vars}/r/ndb_log_updated_only_basic.result | 0 .../sys_vars}/r/net_buffer_length_basic.result | 0 .../sys_vars}/r/net_read_timeout_basic.result | 0 .../sys_vars}/r/net_write_timeout_basic.result | 0 mysql-test/{ => suite/sys_vars}/r/new_basic.result | 0 .../sys_vars}/r/old_passwords_basic.result | 0 .../sys_vars}/r/old_passwords_func.result | 0 .../sys_vars}/r/optimizer_prune_level_basic.result | 0 .../sys_vars}/r/optimizer_search_depth_basic.result | 0 .../sys_vars}/r/preload_buffer_size_basic.result | 0 .../sys_vars}/r/query_cache_limit_func.result | 0 .../sys_vars/r/query_cache_size_basic_32.result | 10 ++-------- .../sys_vars/r/query_cache_size_basic_64.result | 10 ++-------- .../sys_vars}/r/query_cache_type_basic.result | 0 .../sys_vars}/r/query_cache_type_func.result | 0 .../r/query_cache_wlock_invalidate_basic.result | 0 .../r/query_cache_wlock_invalidate_func.result | 0 .../sys_vars}/r/query_prealloc_size_func.result | 0 .../sys_vars}/r/read_buffer_size_basic.result | 0 .../{ => suite/sys_vars}/r/read_only_basic.result | 0 .../{ => suite/sys_vars}/r/read_only_func.result | 0 .../sys_vars}/r/read_rnd_buffer_size_basic.result | 0 .../sys_vars}/r/relay_log_purge_basic.result | 0 .../sys_vars}/r/rpl_init_slave_func.result | 0 .../sys_vars}/r/rpl_max_binlog_size_func.result | 1 + .../{ => suite/sys_vars}/r/secure_auth_basic.result | 0 .../{ => suite/sys_vars}/r/secure_auth_func.result | 0 .../sys_vars}/r/slave_allow_batching_basic.result | 0 .../r/slave_compressed_protocol_basic.result | 0 .../sys_vars}/r/slave_exec_mode_basic.result | 0 .../sys_vars}/r/slave_net_timeout_basic.result | 0 .../sys_vars}/r/slow_launch_time_basic.result | 0 .../sys_vars}/r/slow_launch_time_func.result | 0 .../sys_vars}/r/slow_query_log_basic.result | 0 .../sys_vars}/r/slow_query_log_file_basic.result | 0 .../sys_vars}/r/slow_query_log_file_func.result | 0 .../sys_vars}/r/slow_query_log_func.result | 0 .../sys_vars}/r/sql_auto_is_null_basic.result | 0 .../sys_vars}/r/sql_big_selects_basic.result | 0 .../sys_vars}/r/sql_big_selects_func.result | 0 .../sys_vars}/r/sql_big_tables_basic.result | 0 .../sys_vars}/r/sql_big_tables_func.result | 0 .../sys_vars}/r/sql_buffer_result_basic.result | 0 .../sys_vars}/r/sql_buffer_result_func.result | 0 .../{ => suite/sys_vars}/r/sql_log_bin_basic.result | 0 .../{ => suite/sys_vars}/r/sql_log_off_basic.result | 0 .../{ => suite/sys_vars}/r/sql_log_off_func.result | 0 .../r/sql_low_priority_updates_basic.result | 0 .../r/sql_low_priority_updates_func.result | 0 .../sys_vars}/r/sql_max_join_size_func.result | 0 .../{ => suite/sys_vars}/r/sql_mode_basic.result | 0 .../{ => suite/sys_vars}/r/sql_mode_func.result | 0 .../{ => suite/sys_vars}/r/sql_notes_basic.result | 0 .../{ => suite/sys_vars}/r/sql_notes_func.result | 0 .../sys_vars}/r/sql_quote_show_create_basic.result | 0 .../sys_vars}/r/sql_quote_show_create_func.result | 0 .../sys_vars}/r/sql_safe_updates_basic.result | 0 .../sys_vars}/r/sql_safe_updates_func.result | 0 .../sys_vars}/r/sql_select_limit_func.result | 0 .../sys_vars}/r/sql_slave_skip_counter_basic.result | 0 .../sys_vars}/r/sql_warnings_basic.result | 0 .../{ => suite/sys_vars}/r/sql_warnings_func.result | 0 .../{ => suite/sys_vars}/r/ssl_ca_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_capath_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_cert_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_cipher_basic.result | 0 .../{ => suite/sys_vars}/r/ssl_key_basic.result | 0 .../sys_vars}/r/storage_engine_basic.result | 0 .../{ => suite/sys_vars}/r/sync_frm_basic.result | 0 .../sys_vars}/r/system_time_zone_basic.result | 0 .../sys_vars}/r/table_definition_cache_basic.result | 0 .../r/table_lock_wait_timeout_basic.result | 0 .../sys_vars}/r/table_open_cache_basic.result | 0 .../sys_vars}/r/thread_cache_size_func.result | 0 .../sys_vars}/r/thread_handling_basic.result | 0 .../{ => suite/sys_vars}/r/time_zone_basic.result | 0 .../{ => suite/sys_vars}/r/time_zone_func.result | 0 .../sys_vars}/r/timed_mutexes_basic.result | 0 .../suite/sys_vars/r/timestamp_basic_32.result | 5 ----- .../suite/sys_vars/r/timestamp_basic_64.result | 5 ----- .../{ => suite/sys_vars}/r/timestamp_func.result | 0 .../r/timestamp_sysdate_is_now_func.result | 0 .../{ => suite/sys_vars}/r/tmpdir_basic.result | 0 .../sys_vars}/r/tx_isolation_basic.result | 0 .../{ => suite/sys_vars}/r/tx_isolation_func.result | 0 .../sys_vars}/r/unique_checks_basic.result | 0 .../r/updatable_views_with_limit_basic.result | 0 .../r/updatable_views_with_limit_func.result | 0 .../{ => suite/sys_vars}/r/version_basic.result | 0 .../sys_vars}/r/version_comment_basic.result | 0 .../r/version_compile_machine_basic.result | 0 .../sys_vars}/r/version_compile_os_basic.result | 0 .../{ => suite/sys_vars}/r/wait_timeout_func.result | 0 .../sys_vars}/r/warning_count_basic.result | 0 .../{ => suite/sys_vars}/t/auto_commit_basic.test | 0 .../sys_vars}/t/auto_increment_increment_basic.test | 0 .../sys_vars}/t/auto_increment_increment_func.test | 0 .../sys_vars}/t/auto_increment_offset_basic.test | 0 .../sys_vars}/t/auto_increment_offset_func.test | 0 .../sys_vars}/t/autocommit_func-master.opt | 0 .../{ => suite/sys_vars}/t/autocommit_func.test | 0 .../sys_vars}/t/automatic_sp_privileges_basic.test | 0 .../sys_vars}/t/automatic_sp_privileges_func.test | 0 .../{ => suite/sys_vars}/t/basedir_basic.test | 0 .../{ => suite/sys_vars}/t/big_tables_basic.test | 0 .../{ => suite/sys_vars}/t/binlog_format_basic.test | 0 .../sys_vars}/t/character_set_client_basic.test | 2 +- .../sys_vars}/t/character_set_client_func.test | 0 .../sys_vars}/t/character_set_connection_basic.test | 4 ++-- .../sys_vars}/t/character_set_connection_func.test | 0 .../sys_vars}/t/character_set_database_basic.test | 4 ++-- .../sys_vars}/t/character_set_database_func.test | 0 .../sys_vars}/t/character_set_filesystem_basic.test | 4 ++-- .../t/character_set_filesystem_func-master.opt | 0 .../sys_vars}/t/character_set_results_basic.test | 4 ++-- .../sys_vars}/t/character_set_results_func.test | 0 .../sys_vars}/t/character_set_server_basic.test | 4 ++-- .../sys_vars}/t/character_set_server_func.test | 0 .../sys_vars}/t/character_set_system_basic.test | 0 .../sys_vars}/t/collation_connection_basic.test | 4 ++-- .../sys_vars}/t/collation_connection_func.test | 0 .../sys_vars}/t/collation_database_basic.test | 4 ++-- .../sys_vars}/t/collation_database_func.test | 0 .../sys_vars}/t/collation_server_basic.test | 4 ++-- .../sys_vars}/t/collation_server_func.test | 0 .../sys_vars}/t/completion_type_basic.test | 0 .../sys_vars}/t/completion_type_func-master.opt | 0 .../sys_vars}/t/completion_type_func.test | 0 .../sys_vars}/t/concurrent_insert_basic.test | 0 .../sys_vars}/t/concurrent_insert_func.test | 0 .../sys_vars}/t/connect_timeout_basic.test | 0 .../{ => suite/sys_vars}/t/datadir_basic.test | 0 .../sys_vars}/t/default_week_format_basic.test | 0 .../sys_vars}/t/default_week_format_func.test | 0 .../sys_vars}/t/delay_key_write_basic.test | 0 .../sys_vars}/t/delay_key_write_func-master.opt | 0 .../sys_vars}/t/delay_key_write_func.test | 0 .../sys_vars}/t/delayed_insert_limit_func.test | 0 .../sys_vars}/t/delayed_insert_timeout_basic.test | 0 .../sys_vars}/t/div_precision_increment_basic.test | 0 .../sys_vars}/t/div_precision_increment_func.test | 0 .../t/engine_condition_pushdown_basic.test | 0 .../{ => suite/sys_vars}/t/error_count_basic.test | 0 .../sys_vars}/t/event_scheduler_basic.test | 0 .../sys_vars}/t/event_scheduler_func.test | 0 .../sys_vars}/t/expire_logs_days_basic.test | 0 mysql-test/{ => suite/sys_vars}/t/flush_basic.test | 0 .../sys_vars}/t/foreign_key_checks_basic.test | 0 .../sys_vars}/t/foreign_key_checks_func.test | 0 .../sys_vars}/t/ft_boolean_syntax_basic.test | 0 .../sys_vars}/t/ft_boolean_syntax_func.test | 0 .../{ => suite/sys_vars}/t/general_log_basic.test | 0 .../sys_vars}/t/general_log_file_basic-master.opt | 0 .../sys_vars}/t/general_log_file_basic.test | 0 .../sys_vars}/t/general_log_file_func-master.opt | 0 .../sys_vars}/t/general_log_file_func.test | 0 .../{ => suite/sys_vars}/t/general_log_func.test | 0 .../sys_vars}/t/group_concat_max_len_basic.test | 0 .../sys_vars}/t/group_concat_max_len_func.test | 0 .../{ => suite/sys_vars}/t/have_compress_basic.test | 0 .../{ => suite/sys_vars}/t/have_crypt_basic.test | 0 .../{ => suite/sys_vars}/t/have_csv_basic.test | 0 .../sys_vars}/t/have_dynamic_loading_basic.test | 0 .../{ => suite/sys_vars}/t/have_geometry_basic.test | 0 .../{ => suite/sys_vars}/t/have_innodb_basic.test | 0 .../sys_vars}/t/have_ndbcluster_basic.test | 0 .../{ => suite/sys_vars}/t/have_openssl_basic.test | 0 .../sys_vars}/t/have_partitioning_basic.test | 0 .../sys_vars}/t/have_query_cache_basic.test | 0 .../sys_vars}/t/have_rtree_keys_basic.test | 0 .../{ => suite/sys_vars}/t/have_ssl_basic.test | 0 .../{ => suite/sys_vars}/t/have_symlink_basic.test | 0 .../{ => suite/sys_vars}/t/hostname_basic.test | 0 .../{ => suite/sys_vars}/t/identity_basic.test | 0 .../{ => suite/sys_vars}/t/identity_func-master.opt | 0 .../{ => suite/sys_vars}/t/identity_func.test | 0 .../{ => suite/sys_vars}/t/init_connect_basic.test | 0 .../{ => suite/sys_vars}/t/init_slave_basic.test | 0 .../t/innodb_additional_mem_pool_size_basic.test | 0 .../t/innodb_autoextend_increment_basic.test | 0 .../sys_vars}/t/innodb_autoinc_lock_mode_basic.test | 0 .../t/innodb_autoinc_lock_mode_func-master.opt | 0 .../sys_vars}/t/innodb_autoinc_lock_mode_func.test | 0 .../sys_vars}/t/innodb_buffer_pool_size_basic.test | 0 .../sys_vars}/t/innodb_checksums_basic.test | 0 .../t/innodb_commit_concurrency_basic.test | 0 .../sys_vars}/t/innodb_data_file_path_basic.test | 0 .../sys_vars}/t/innodb_data_home_dir_basic.test | 0 .../sys_vars}/t/innodb_doublewrite_basic.test | 0 .../sys_vars}/t/innodb_fast_shutdown_basic.test | 0 .../sys_vars}/t/innodb_file_io_threads_basic.test | 0 .../sys_vars}/t/innodb_file_per_table_basic.test | 0 .../t/innodb_flush_log_at_trx_commit_basic.test | 0 .../sys_vars}/t/innodb_flush_method_basic.test | 0 .../sys_vars}/t/innodb_force_recovery_basic.test | 0 .../sys_vars}/t/innodb_lock_wait_timeout_basic.test | 0 .../t/innodb_locks_unsafe_for_binlog_basic.test | 0 .../sys_vars}/t/innodb_log_buffer_size_basic.test | 0 .../sys_vars}/t/innodb_log_file_size_basic.test | 0 .../t/innodb_log_files_in_group_basic.test | 0 .../t/innodb_log_group_home_dir_basic.test | 0 .../t/innodb_max_dirty_pages_pct_basic.test | 0 .../t/innodb_max_dirty_pages_pct_func.test | 0 .../t/innodb_mirrored_log_groups_basic.test | 0 .../sys_vars}/t/innodb_open_files_basic.test | 0 .../t/innodb_rollback_on_timeout_basic.test | 0 .../sys_vars}/t/innodb_support_xa_basic.test | 0 .../sys_vars}/t/innodb_support_xa_func.test | 0 .../sys_vars}/t/innodb_table_locks_basic.test | 0 .../sys_vars}/t/innodb_table_locks_func.test | 0 .../t/innodb_thread_concurrency_basic.test | 0 .../{ => suite/sys_vars}/t/insert_id_basic.test | 0 .../{ => suite/sys_vars}/t/insert_id_func.test | 0 .../sys_vars}/t/interactive_timeout_basic.test | 0 .../sys_vars}/t/interactive_timeout_func.test | 0 .../sys_vars}/t/keep_files_on_create_basic.test | 0 .../sys_vars}/t/key_buffer_size_func.test | 0 .../sys_vars}/t/last_insert_id_func-master.opt | 0 .../{ => suite/sys_vars}/t/last_insert_id_func.test | 0 .../{ => suite/sys_vars}/t/lc_time_names_basic.test | 0 .../{ => suite/sys_vars}/t/lc_time_names_func.test | 0 .../{ => suite/sys_vars}/t/license_basic.test | 0 .../{ => suite/sys_vars}/t/local_infile_basic.test | 0 .../{ => suite/sys_vars}/t/local_infile_func.test | 0 mysql-test/{ => suite/sys_vars}/t/log_basic.test | 0 .../t/log_bin_trust_function_creators_basic.test | 0 .../log_bin_trust_function_creators_func-master.opt | 0 .../t/log_bin_trust_function_creators_func.test | 0 .../t/log_bin_trust_routine_creators_basic.test | 0 .../{ => suite/sys_vars}/t/log_output_basic.test | 0 .../{ => suite/sys_vars}/t/log_output_func.test | 0 .../t/log_queries_not_using_indexes_basic.test | 0 .../sys_vars}/t/long_query_time_basic.test | 0 .../sys_vars}/t/low_priority_updates_basic.test | 0 .../sys_vars}/t/max_allowed_packet_basic.test | 0 .../sys_vars}/t/max_allowed_packet_func.test | 0 .../t/max_binlog_cache_size_func-master.opt | 0 .../sys_vars}/t/max_binlog_size_basic.test | 0 .../sys_vars}/t/max_connections_basic.test | 0 .../sys_vars}/t/max_delayed_threads_basic.test | 0 .../sys_vars}/t/max_error_count_basic.test | 0 .../t/max_insert_delayed_threads_basic.test | 0 .../{ => suite/sys_vars}/t/max_join_size_func.test | 0 .../sys_vars}/t/max_length_for_sort_data_basic.test | 0 .../sys_vars}/t/max_prepared_stmt_count_basic.test | 0 .../sys_vars}/t/max_prepared_stmt_count_func.test | 0 .../sys_vars}/t/max_relay_log_size_basic.test | 0 .../sys_vars}/t/max_seeks_for_key_func.test | 0 .../sys_vars}/t/max_sort_length_basic.test | 0 .../sys_vars}/t/max_sort_length_func.test | 0 .../sys_vars}/t/max_sp_recursion_depth_basic.test | 0 .../sys_vars}/t/max_sp_recursion_depth_func.test | 0 .../sys_vars}/t/max_user_connections_basic.test | 0 .../sys_vars}/t/max_user_connections_func.test | 0 .../sys_vars}/t/myisam_data_pointer_size_basic.test | 0 .../sys_vars}/t/myisam_data_pointer_size_func.test | 0 .../sys_vars}/t/myisam_stats_method_basic.test | 0 .../sys_vars}/t/myisam_stats_method_func.test | 0 .../sys_vars}/t/myisam_use_mmap_basic.test | 0 .../sys_vars}/t/ndb_log_update_as_write_basic.test | 0 .../sys_vars}/t/ndb_log_updated_only_basic.test | 0 .../sys_vars}/t/net_buffer_length_basic.test | 0 .../sys_vars}/t/net_read_timeout_basic.test | 0 .../sys_vars}/t/net_write_timeout_basic.test | 0 mysql-test/{ => suite/sys_vars}/t/new_basic.test | 0 .../{ => suite/sys_vars}/t/old_passwords_basic.test | 0 .../{ => suite/sys_vars}/t/old_passwords_func.test | 0 .../sys_vars}/t/optimizer_prune_level_basic.test | 0 .../sys_vars}/t/optimizer_search_depth_basic.test | 0 .../sys_vars}/t/preload_buffer_size_basic.test | 0 .../sys_vars}/t/query_cache_limit_func.test | 0 .../sys_vars}/t/query_cache_type_basic.test | 0 .../sys_vars}/t/query_cache_type_func.test | 0 .../t/query_cache_wlock_invalidate_basic.test | 0 .../t/query_cache_wlock_invalidate_func.test | 0 .../sys_vars}/t/query_prealloc_size_func.test | 0 .../sys_vars}/t/read_buffer_size_basic.test | 0 .../{ => suite/sys_vars}/t/read_only_basic.test | 0 .../{ => suite/sys_vars}/t/read_only_func.test | 0 .../sys_vars}/t/read_rnd_buffer_size_basic.test | 0 .../sys_vars}/t/relay_log_purge_basic.test | 0 .../sys_vars}/t/rpl_init_slave_func-slave.opt | 0 .../{ => suite/sys_vars}/t/rpl_init_slave_func.test | 0 .../sys_vars}/t/rpl_max_binlog_size_func-master.opt | 0 .../sys_vars}/t/rpl_max_binlog_size_func.test | 1 + .../{ => suite/sys_vars}/t/secure_auth_basic.test | 0 .../sys_vars}/t/secure_auth_func-master.opt | 0 .../{ => suite/sys_vars}/t/secure_auth_func.test | 0 .../sys_vars}/t/slave_allow_batching_basic.test | 0 .../t/slave_compressed_protocol_basic.test | 0 .../sys_vars}/t/slave_exec_mode_basic.test | 0 .../sys_vars}/t/slave_net_timeout_basic.test | 0 .../sys_vars}/t/slow_launch_time_basic.test | 0 .../sys_vars}/t/slow_launch_time_func.test | 0 .../sys_vars}/t/slow_query_log_basic.test | 0 .../t/slow_query_log_file_basic-master.opt | 0 .../sys_vars}/t/slow_query_log_file_basic.test | 0 .../sys_vars}/t/slow_query_log_file_func-master.opt | 0 .../sys_vars}/t/slow_query_log_file_func.test | 0 .../{ => suite/sys_vars}/t/slow_query_log_func.test | 0 .../sys_vars}/t/sql_auto_is_null_basic.test | 0 .../sys_vars}/t/sql_big_selects_basic.test | 0 .../sys_vars}/t/sql_big_selects_func.test | 0 .../sys_vars}/t/sql_big_tables_basic.test | 0 .../{ => suite/sys_vars}/t/sql_big_tables_func.test | 0 .../sys_vars}/t/sql_buffer_result_basic.test | 0 .../sys_vars}/t/sql_buffer_result_func.test | 0 .../{ => suite/sys_vars}/t/sql_log_bin_basic.test | 0 .../{ => suite/sys_vars}/t/sql_log_off_basic.test | 0 .../{ => suite/sys_vars}/t/sql_log_off_func.test | 0 .../sys_vars}/t/sql_low_priority_updates_basic.test | 0 .../sys_vars}/t/sql_low_priority_updates_func.test | 0 .../sys_vars}/t/sql_max_join_size_func.test | 0 .../{ => suite/sys_vars}/t/sql_mode_basic.test | 0 .../{ => suite/sys_vars}/t/sql_mode_func.test | 0 .../{ => suite/sys_vars}/t/sql_notes_basic.test | 0 .../{ => suite/sys_vars}/t/sql_notes_func.test | 0 .../sys_vars}/t/sql_quote_show_create_basic.test | 0 .../sys_vars}/t/sql_quote_show_create_func.test | 0 .../sys_vars}/t/sql_safe_updates_basic.test | 0 .../sys_vars}/t/sql_safe_updates_func.test | 0 .../sys_vars}/t/sql_select_limit_func.test | 0 .../sys_vars}/t/sql_slave_skip_counter_basic.test | 0 .../{ => suite/sys_vars}/t/sql_warnings_basic.test | 0 .../{ => suite/sys_vars}/t/sql_warnings_func.test | 0 mysql-test/{ => suite/sys_vars}/t/ssl_ca_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_capath_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_cert_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_cipher_basic.test | 0 .../{ => suite/sys_vars}/t/ssl_key_basic.test | 0 .../sys_vars}/t/storage_engine_basic-master.opt | 0 .../sys_vars}/t/storage_engine_basic.test | 0 .../{ => suite/sys_vars}/t/sync_frm_basic.test | 0 .../sys_vars}/t/system_time_zone_basic.test | 0 .../sys_vars}/t/table_definition_cache_basic.test | 0 .../sys_vars}/t/table_lock_wait_timeout_basic.test | 0 .../sys_vars}/t/table_open_cache_basic.test | 0 .../sys_vars}/t/thread_cache_size_func.test | 0 .../sys_vars}/t/thread_handling_basic.test | 0 .../{ => suite/sys_vars}/t/time_zone_basic.test | 0 .../{ => suite/sys_vars}/t/time_zone_func.test | 0 .../{ => suite/sys_vars}/t/timed_mutexes_basic.test | 0 .../{ => suite/sys_vars}/t/timestamp_func.test | 0 .../t/timestamp_sysdate_is_now_func-master.opt | 0 .../sys_vars}/t/timestamp_sysdate_is_now_func.test | 0 mysql-test/{ => suite/sys_vars}/t/tmpdir_basic.test | 0 .../{ => suite/sys_vars}/t/tx_isolation_basic.test | 0 .../sys_vars}/t/tx_isolation_func-master.opt | 0 .../{ => suite/sys_vars}/t/tx_isolation_func.test | 0 .../{ => suite/sys_vars}/t/unique_checks_basic.test | 0 .../t/updatable_views_with_limit_basic.test | 0 .../t/updatable_views_with_limit_func.test | 0 .../{ => suite/sys_vars}/t/version_basic.test | 0 .../sys_vars}/t/version_comment_basic.test | 0 .../sys_vars}/t/version_compile_machine_basic.test | 0 .../sys_vars}/t/version_compile_os_basic.test | 0 .../{ => suite/sys_vars}/t/wait_timeout_func.test | 0 .../{ => suite/sys_vars}/t/warning_count_basic.test | 0 520 files changed, 30 insertions(+), 51 deletions(-) rename mysql-test/{include => suite/sys_vars/inc}/charset_basic.inc (100%) rename mysql-test/{include => suite/sys_vars/inc}/collation_basic.inc (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_commit_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_increment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_increment_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_offset_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/auto_increment_offset_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/autocommit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/automatic_sp_privileges_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/automatic_sp_privileges_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/basedir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/big_tables_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/binlog_format_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_client_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_client_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_connection_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_connection_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_database_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_database_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_filesystem_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_results_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_results_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_server_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_server_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/character_set_system_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_connection_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_connection_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_database_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_database_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_server_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/collation_server_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/completion_type_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/completion_type_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/concurrent_insert_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/concurrent_insert_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/connect_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/datadir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/default_week_format_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/default_week_format_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delay_key_write_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delay_key_write_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delayed_insert_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/delayed_insert_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/div_precision_increment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/div_precision_increment_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/engine_condition_pushdown_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/error_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/event_scheduler_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/event_scheduler_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/expire_logs_days_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/flush_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/foreign_key_checks_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/foreign_key_checks_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ft_boolean_syntax_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ft_boolean_syntax_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_file_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_file_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/general_log_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/group_concat_max_len_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/group_concat_max_len_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_compress_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_crypt_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_csv_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_dynamic_loading_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_geometry_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_innodb_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_ndbcluster_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_openssl_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_partitioning_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_query_cache_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_rtree_keys_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_ssl_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/have_symlink_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/hostname_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/identity_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/identity_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/init_connect_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/init_slave_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_additional_mem_pool_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_autoextend_increment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_autoinc_lock_mode_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_autoinc_lock_mode_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_buffer_pool_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_checksums_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_commit_concurrency_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_data_file_path_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_data_home_dir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_doublewrite_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_fast_shutdown_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_file_io_threads_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_file_per_table_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_flush_log_at_trx_commit_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_flush_method_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_force_recovery_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_lock_wait_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_locks_unsafe_for_binlog_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_file_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_files_in_group_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_log_group_home_dir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_max_dirty_pages_pct_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_max_dirty_pages_pct_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_mirrored_log_groups_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_open_files_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_rollback_on_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_support_xa_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_support_xa_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_table_locks_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_table_locks_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_thread_concurrency_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/innodb_thread_sleep_delay_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/insert_id_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/insert_id_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/interactive_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/interactive_timeout_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/keep_files_on_create_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/key_buffer_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/last_insert_id_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/lc_time_names_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/lc_time_names_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/license_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/local_infile_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/local_infile_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_bin_trust_function_creators_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_bin_trust_function_creators_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_bin_trust_routine_creators_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_output_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_output_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/log_queries_not_using_indexes_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/long_query_time_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/low_priority_updates_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_allowed_packet_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_allowed_packet_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_binlog_cache_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_binlog_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_connections_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_delayed_threads_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_error_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_insert_delayed_threads_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_join_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_length_for_sort_data_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_prepared_stmt_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_prepared_stmt_count_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_relay_log_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_seeks_for_key_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sort_length_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sort_length_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sp_recursion_depth_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_sp_recursion_depth_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_user_connections_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/max_user_connections_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_data_pointer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_data_pointer_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_sort_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_stats_method_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_stats_method_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/myisam_use_mmap_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ndb_log_update_as_write_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ndb_log_updated_only_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/net_buffer_length_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/net_read_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/net_write_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/new_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/old_passwords_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/old_passwords_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/optimizer_prune_level_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/optimizer_search_depth_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/preload_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_type_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_type_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_wlock_invalidate_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_cache_wlock_invalidate_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/query_prealloc_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_only_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_only_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/read_rnd_buffer_size_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/relay_log_purge_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/rpl_init_slave_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/rpl_max_binlog_size_func.result (91%) rename mysql-test/{ => suite/sys_vars}/r/secure_auth_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/secure_auth_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_allow_batching_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_compressed_protocol_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_exec_mode_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slave_net_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_launch_time_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_launch_time_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_file_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_file_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/slow_query_log_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_auto_is_null_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_selects_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_selects_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_tables_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_big_tables_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_buffer_result_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_buffer_result_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_log_bin_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_log_off_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_log_off_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_low_priority_updates_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_low_priority_updates_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_max_join_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_mode_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_mode_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_notes_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_notes_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_quote_show_create_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_quote_show_create_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_safe_updates_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_safe_updates_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_select_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_slave_skip_counter_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_warnings_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sql_warnings_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_ca_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_capath_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_cert_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_cipher_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/ssl_key_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/storage_engine_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/sync_frm_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/system_time_zone_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/table_definition_cache_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/table_lock_wait_timeout_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/table_open_cache_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/thread_cache_size_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/thread_handling_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/time_zone_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/time_zone_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/timed_mutexes_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/timestamp_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/timestamp_sysdate_is_now_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/tmpdir_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/tx_isolation_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/tx_isolation_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/unique_checks_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/updatable_views_with_limit_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/updatable_views_with_limit_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_comment_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_compile_machine_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/version_compile_os_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/r/wait_timeout_func.result (100%) rename mysql-test/{ => suite/sys_vars}/r/warning_count_basic.result (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_commit_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_increment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_increment_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_offset_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/auto_increment_offset_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/autocommit_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/autocommit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/automatic_sp_privileges_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/automatic_sp_privileges_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/basedir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/big_tables_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/binlog_format_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_client_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_client_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_connection_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_connection_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_database_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_database_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_filesystem_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_filesystem_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_results_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_results_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_server_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/character_set_server_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/character_set_system_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/collation_connection_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/collation_connection_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/collation_database_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/collation_database_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/collation_server_basic.test (99%) rename mysql-test/{ => suite/sys_vars}/t/collation_server_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/completion_type_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/completion_type_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/completion_type_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/concurrent_insert_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/concurrent_insert_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/connect_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/datadir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/default_week_format_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/default_week_format_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delay_key_write_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delay_key_write_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/delay_key_write_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delayed_insert_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/delayed_insert_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/div_precision_increment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/div_precision_increment_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/engine_condition_pushdown_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/error_count_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/event_scheduler_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/event_scheduler_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/expire_logs_days_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/flush_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/foreign_key_checks_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/foreign_key_checks_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ft_boolean_syntax_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ft_boolean_syntax_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_basic-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_file_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/general_log_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/group_concat_max_len_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/group_concat_max_len_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_compress_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_crypt_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_csv_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_dynamic_loading_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_geometry_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_innodb_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_ndbcluster_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_openssl_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_partitioning_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_query_cache_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_rtree_keys_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_ssl_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/have_symlink_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/hostname_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/identity_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/identity_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/identity_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/init_connect_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/init_slave_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_additional_mem_pool_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoextend_increment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoinc_lock_mode_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoinc_lock_mode_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_autoinc_lock_mode_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_buffer_pool_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_checksums_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_commit_concurrency_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_data_file_path_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_data_home_dir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_doublewrite_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_fast_shutdown_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_file_io_threads_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_file_per_table_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_flush_log_at_trx_commit_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_flush_method_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_force_recovery_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_lock_wait_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_locks_unsafe_for_binlog_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_file_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_files_in_group_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_log_group_home_dir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_max_dirty_pages_pct_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_max_dirty_pages_pct_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_mirrored_log_groups_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_open_files_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_rollback_on_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_support_xa_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_support_xa_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_table_locks_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_table_locks_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/innodb_thread_concurrency_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/insert_id_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/insert_id_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/interactive_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/interactive_timeout_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/keep_files_on_create_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/key_buffer_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/last_insert_id_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/last_insert_id_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/lc_time_names_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/lc_time_names_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/license_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/local_infile_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/local_infile_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_function_creators_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_function_creators_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_function_creators_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_bin_trust_routine_creators_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_output_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_output_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/log_queries_not_using_indexes_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/long_query_time_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/low_priority_updates_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_allowed_packet_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_allowed_packet_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_binlog_cache_size_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/max_binlog_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_connections_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_delayed_threads_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_error_count_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_insert_delayed_threads_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_join_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_length_for_sort_data_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_prepared_stmt_count_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_prepared_stmt_count_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_relay_log_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_seeks_for_key_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sort_length_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sort_length_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sp_recursion_depth_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_sp_recursion_depth_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_user_connections_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/max_user_connections_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_data_pointer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_data_pointer_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_stats_method_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_stats_method_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/myisam_use_mmap_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ndb_log_update_as_write_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ndb_log_updated_only_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/net_buffer_length_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/net_read_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/net_write_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/new_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/old_passwords_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/old_passwords_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/optimizer_prune_level_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/optimizer_search_depth_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/preload_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_type_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_type_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_wlock_invalidate_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_cache_wlock_invalidate_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/query_prealloc_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_only_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_only_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/read_rnd_buffer_size_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/relay_log_purge_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_init_slave_func-slave.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_init_slave_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_max_binlog_size_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/rpl_max_binlog_size_func.test (98%) rename mysql-test/{ => suite/sys_vars}/t/secure_auth_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/secure_auth_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/secure_auth_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_allow_batching_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_compressed_protocol_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_exec_mode_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slave_net_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_launch_time_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_launch_time_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_basic-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_file_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/slow_query_log_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_auto_is_null_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_selects_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_selects_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_tables_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_big_tables_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_buffer_result_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_buffer_result_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_log_bin_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_log_off_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_log_off_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_low_priority_updates_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_low_priority_updates_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_max_join_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_mode_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_mode_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_notes_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_notes_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_quote_show_create_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_quote_show_create_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_safe_updates_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_safe_updates_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_select_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_slave_skip_counter_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_warnings_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sql_warnings_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_ca_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_capath_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_cert_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_cipher_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/ssl_key_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/storage_engine_basic-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/storage_engine_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/sync_frm_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/system_time_zone_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/table_definition_cache_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/table_lock_wait_timeout_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/table_open_cache_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/thread_cache_size_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/thread_handling_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/time_zone_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/time_zone_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/timed_mutexes_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/timestamp_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/timestamp_sysdate_is_now_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/timestamp_sysdate_is_now_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/tmpdir_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/tx_isolation_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/tx_isolation_func-master.opt (100%) rename mysql-test/{ => suite/sys_vars}/t/tx_isolation_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/unique_checks_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/updatable_views_with_limit_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/updatable_views_with_limit_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_comment_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_compile_machine_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/version_compile_os_basic.test (100%) rename mysql-test/{ => suite/sys_vars}/t/wait_timeout_func.test (100%) rename mysql-test/{ => suite/sys_vars}/t/warning_count_basic.test (100%) diff --git a/mysql-test/include/charset_basic.inc b/mysql-test/suite/sys_vars/inc/charset_basic.inc similarity index 100% rename from mysql-test/include/charset_basic.inc rename to mysql-test/suite/sys_vars/inc/charset_basic.inc diff --git a/mysql-test/include/collation_basic.inc b/mysql-test/suite/sys_vars/inc/collation_basic.inc similarity index 100% rename from mysql-test/include/collation_basic.inc rename to mysql-test/suite/sys_vars/inc/collation_basic.inc diff --git a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc index 1a3f9e1efe2..1f8c63c55bb 100644 --- a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc +++ b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc @@ -36,7 +36,6 @@ ############################################################################### SET @start_value = @@global.query_cache_size; -SELECT @start_value; --echo '#--------------------FN_DYNVARS_133_01------------------------#' ############################################################################### @@ -53,7 +52,7 @@ SELECT @@global.query_cache_size; ############################################### SET @@global.query_cache_size = @start_value; -SELECT @@global.query_cache_size = 0; +SELECT @@global.query_cache_size = @start_value; --echo '#--------------------FN_DYNVARS_133_03------------------------#' ################################################################################ @@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size; ############################## SET @@global.query_cache_size = @start_value; -SELECT @@global.query_cache_size; ######################################################################## # END OF query_cache_size TESTS # diff --git a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc index d7ad620ec26..9ef57c97043 100644 --- a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc +++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc @@ -18,8 +18,8 @@ # * Scope & Access method # # * Data Integrity # # # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # +# Reference: # +# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # # # ############################################################################### @@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999; # Check if the value in SESSION Table matches value in variable # ######################################################################### -SELECT @@timestamp = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='timestamp'; +# disabled due to bug#41584 +#SELECT @@timestamp = VARIABLE_VALUE +#FROM INFORMATION_SCHEMA.SESSION_VARIABLES +#WHERE VARIABLE_NAME='timestamp'; --echo '#---------------------FN_DYNVARS_001_08-------------------------#' ############################################################################# diff --git a/mysql-test/r/auto_commit_basic.result b/mysql-test/suite/sys_vars/r/auto_commit_basic.result similarity index 100% rename from mysql-test/r/auto_commit_basic.result rename to mysql-test/suite/sys_vars/r/auto_commit_basic.result diff --git a/mysql-test/r/auto_increment_increment_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result similarity index 100% rename from mysql-test/r/auto_increment_increment_basic.result rename to mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result diff --git a/mysql-test/r/auto_increment_increment_func.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result similarity index 100% rename from mysql-test/r/auto_increment_increment_func.result rename to mysql-test/suite/sys_vars/r/auto_increment_increment_func.result diff --git a/mysql-test/r/auto_increment_offset_basic.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result similarity index 100% rename from mysql-test/r/auto_increment_offset_basic.result rename to mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result diff --git a/mysql-test/r/auto_increment_offset_func.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result similarity index 100% rename from mysql-test/r/auto_increment_offset_func.result rename to mysql-test/suite/sys_vars/r/auto_increment_offset_func.result diff --git a/mysql-test/r/autocommit_func.result b/mysql-test/suite/sys_vars/r/autocommit_func.result similarity index 100% rename from mysql-test/r/autocommit_func.result rename to mysql-test/suite/sys_vars/r/autocommit_func.result diff --git a/mysql-test/r/automatic_sp_privileges_basic.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result similarity index 100% rename from mysql-test/r/automatic_sp_privileges_basic.result rename to mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result diff --git a/mysql-test/r/automatic_sp_privileges_func.result b/mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result similarity index 100% rename from mysql-test/r/automatic_sp_privileges_func.result rename to mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result diff --git a/mysql-test/r/basedir_basic.result b/mysql-test/suite/sys_vars/r/basedir_basic.result similarity index 100% rename from mysql-test/r/basedir_basic.result rename to mysql-test/suite/sys_vars/r/basedir_basic.result diff --git a/mysql-test/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result similarity index 100% rename from mysql-test/r/big_tables_basic.result rename to mysql-test/suite/sys_vars/r/big_tables_basic.result diff --git a/mysql-test/r/binlog_format_basic.result b/mysql-test/suite/sys_vars/r/binlog_format_basic.result similarity index 100% rename from mysql-test/r/binlog_format_basic.result rename to mysql-test/suite/sys_vars/r/binlog_format_basic.result diff --git a/mysql-test/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result similarity index 100% rename from mysql-test/r/character_set_client_basic.result rename to mysql-test/suite/sys_vars/r/character_set_client_basic.result diff --git a/mysql-test/r/character_set_client_func.result b/mysql-test/suite/sys_vars/r/character_set_client_func.result similarity index 100% rename from mysql-test/r/character_set_client_func.result rename to mysql-test/suite/sys_vars/r/character_set_client_func.result diff --git a/mysql-test/r/character_set_connection_basic.result b/mysql-test/suite/sys_vars/r/character_set_connection_basic.result similarity index 100% rename from mysql-test/r/character_set_connection_basic.result rename to mysql-test/suite/sys_vars/r/character_set_connection_basic.result diff --git a/mysql-test/r/character_set_connection_func.result b/mysql-test/suite/sys_vars/r/character_set_connection_func.result similarity index 100% rename from mysql-test/r/character_set_connection_func.result rename to mysql-test/suite/sys_vars/r/character_set_connection_func.result diff --git a/mysql-test/r/character_set_database_basic.result b/mysql-test/suite/sys_vars/r/character_set_database_basic.result similarity index 100% rename from mysql-test/r/character_set_database_basic.result rename to mysql-test/suite/sys_vars/r/character_set_database_basic.result diff --git a/mysql-test/r/character_set_database_func.result b/mysql-test/suite/sys_vars/r/character_set_database_func.result similarity index 100% rename from mysql-test/r/character_set_database_func.result rename to mysql-test/suite/sys_vars/r/character_set_database_func.result diff --git a/mysql-test/r/character_set_filesystem_basic.result b/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result similarity index 100% rename from mysql-test/r/character_set_filesystem_basic.result rename to mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result diff --git a/mysql-test/r/character_set_results_basic.result b/mysql-test/suite/sys_vars/r/character_set_results_basic.result similarity index 100% rename from mysql-test/r/character_set_results_basic.result rename to mysql-test/suite/sys_vars/r/character_set_results_basic.result diff --git a/mysql-test/r/character_set_results_func.result b/mysql-test/suite/sys_vars/r/character_set_results_func.result similarity index 100% rename from mysql-test/r/character_set_results_func.result rename to mysql-test/suite/sys_vars/r/character_set_results_func.result diff --git a/mysql-test/r/character_set_server_basic.result b/mysql-test/suite/sys_vars/r/character_set_server_basic.result similarity index 100% rename from mysql-test/r/character_set_server_basic.result rename to mysql-test/suite/sys_vars/r/character_set_server_basic.result diff --git a/mysql-test/r/character_set_server_func.result b/mysql-test/suite/sys_vars/r/character_set_server_func.result similarity index 100% rename from mysql-test/r/character_set_server_func.result rename to mysql-test/suite/sys_vars/r/character_set_server_func.result diff --git a/mysql-test/r/character_set_system_basic.result b/mysql-test/suite/sys_vars/r/character_set_system_basic.result similarity index 100% rename from mysql-test/r/character_set_system_basic.result rename to mysql-test/suite/sys_vars/r/character_set_system_basic.result diff --git a/mysql-test/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result similarity index 100% rename from mysql-test/r/collation_connection_basic.result rename to mysql-test/suite/sys_vars/r/collation_connection_basic.result diff --git a/mysql-test/r/collation_connection_func.result b/mysql-test/suite/sys_vars/r/collation_connection_func.result similarity index 100% rename from mysql-test/r/collation_connection_func.result rename to mysql-test/suite/sys_vars/r/collation_connection_func.result diff --git a/mysql-test/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result similarity index 100% rename from mysql-test/r/collation_database_basic.result rename to mysql-test/suite/sys_vars/r/collation_database_basic.result diff --git a/mysql-test/r/collation_database_func.result b/mysql-test/suite/sys_vars/r/collation_database_func.result similarity index 100% rename from mysql-test/r/collation_database_func.result rename to mysql-test/suite/sys_vars/r/collation_database_func.result diff --git a/mysql-test/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result similarity index 100% rename from mysql-test/r/collation_server_basic.result rename to mysql-test/suite/sys_vars/r/collation_server_basic.result diff --git a/mysql-test/r/collation_server_func.result b/mysql-test/suite/sys_vars/r/collation_server_func.result similarity index 100% rename from mysql-test/r/collation_server_func.result rename to mysql-test/suite/sys_vars/r/collation_server_func.result diff --git a/mysql-test/r/completion_type_basic.result b/mysql-test/suite/sys_vars/r/completion_type_basic.result similarity index 100% rename from mysql-test/r/completion_type_basic.result rename to mysql-test/suite/sys_vars/r/completion_type_basic.result diff --git a/mysql-test/r/completion_type_func.result b/mysql-test/suite/sys_vars/r/completion_type_func.result similarity index 100% rename from mysql-test/r/completion_type_func.result rename to mysql-test/suite/sys_vars/r/completion_type_func.result diff --git a/mysql-test/r/concurrent_insert_basic.result b/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result similarity index 100% rename from mysql-test/r/concurrent_insert_basic.result rename to mysql-test/suite/sys_vars/r/concurrent_insert_basic.result diff --git a/mysql-test/r/concurrent_insert_func.result b/mysql-test/suite/sys_vars/r/concurrent_insert_func.result similarity index 100% rename from mysql-test/r/concurrent_insert_func.result rename to mysql-test/suite/sys_vars/r/concurrent_insert_func.result diff --git a/mysql-test/r/connect_timeout_basic.result b/mysql-test/suite/sys_vars/r/connect_timeout_basic.result similarity index 100% rename from mysql-test/r/connect_timeout_basic.result rename to mysql-test/suite/sys_vars/r/connect_timeout_basic.result diff --git a/mysql-test/r/datadir_basic.result b/mysql-test/suite/sys_vars/r/datadir_basic.result similarity index 100% rename from mysql-test/r/datadir_basic.result rename to mysql-test/suite/sys_vars/r/datadir_basic.result diff --git a/mysql-test/r/default_week_format_basic.result b/mysql-test/suite/sys_vars/r/default_week_format_basic.result similarity index 100% rename from mysql-test/r/default_week_format_basic.result rename to mysql-test/suite/sys_vars/r/default_week_format_basic.result diff --git a/mysql-test/r/default_week_format_func.result b/mysql-test/suite/sys_vars/r/default_week_format_func.result similarity index 100% rename from mysql-test/r/default_week_format_func.result rename to mysql-test/suite/sys_vars/r/default_week_format_func.result diff --git a/mysql-test/r/delay_key_write_basic.result b/mysql-test/suite/sys_vars/r/delay_key_write_basic.result similarity index 100% rename from mysql-test/r/delay_key_write_basic.result rename to mysql-test/suite/sys_vars/r/delay_key_write_basic.result diff --git a/mysql-test/r/delay_key_write_func.result b/mysql-test/suite/sys_vars/r/delay_key_write_func.result similarity index 100% rename from mysql-test/r/delay_key_write_func.result rename to mysql-test/suite/sys_vars/r/delay_key_write_func.result diff --git a/mysql-test/r/delayed_insert_limit_func.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result similarity index 100% rename from mysql-test/r/delayed_insert_limit_func.result rename to mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result diff --git a/mysql-test/r/delayed_insert_timeout_basic.result b/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result similarity index 100% rename from mysql-test/r/delayed_insert_timeout_basic.result rename to mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result diff --git a/mysql-test/r/div_precision_increment_basic.result b/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result similarity index 100% rename from mysql-test/r/div_precision_increment_basic.result rename to mysql-test/suite/sys_vars/r/div_precision_increment_basic.result diff --git a/mysql-test/r/div_precision_increment_func.result b/mysql-test/suite/sys_vars/r/div_precision_increment_func.result similarity index 100% rename from mysql-test/r/div_precision_increment_func.result rename to mysql-test/suite/sys_vars/r/div_precision_increment_func.result diff --git a/mysql-test/r/engine_condition_pushdown_basic.result b/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result similarity index 100% rename from mysql-test/r/engine_condition_pushdown_basic.result rename to mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result diff --git a/mysql-test/r/error_count_basic.result b/mysql-test/suite/sys_vars/r/error_count_basic.result similarity index 100% rename from mysql-test/r/error_count_basic.result rename to mysql-test/suite/sys_vars/r/error_count_basic.result diff --git a/mysql-test/r/event_scheduler_basic.result b/mysql-test/suite/sys_vars/r/event_scheduler_basic.result similarity index 100% rename from mysql-test/r/event_scheduler_basic.result rename to mysql-test/suite/sys_vars/r/event_scheduler_basic.result diff --git a/mysql-test/r/event_scheduler_func.result b/mysql-test/suite/sys_vars/r/event_scheduler_func.result similarity index 100% rename from mysql-test/r/event_scheduler_func.result rename to mysql-test/suite/sys_vars/r/event_scheduler_func.result diff --git a/mysql-test/r/expire_logs_days_basic.result b/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result similarity index 100% rename from mysql-test/r/expire_logs_days_basic.result rename to mysql-test/suite/sys_vars/r/expire_logs_days_basic.result diff --git a/mysql-test/r/flush_basic.result b/mysql-test/suite/sys_vars/r/flush_basic.result similarity index 100% rename from mysql-test/r/flush_basic.result rename to mysql-test/suite/sys_vars/r/flush_basic.result diff --git a/mysql-test/r/foreign_key_checks_basic.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result similarity index 100% rename from mysql-test/r/foreign_key_checks_basic.result rename to mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result diff --git a/mysql-test/r/foreign_key_checks_func.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_func.result similarity index 100% rename from mysql-test/r/foreign_key_checks_func.result rename to mysql-test/suite/sys_vars/r/foreign_key_checks_func.result diff --git a/mysql-test/r/ft_boolean_syntax_basic.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result similarity index 100% rename from mysql-test/r/ft_boolean_syntax_basic.result rename to mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result diff --git a/mysql-test/r/ft_boolean_syntax_func.result b/mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result similarity index 100% rename from mysql-test/r/ft_boolean_syntax_func.result rename to mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result diff --git a/mysql-test/r/general_log_basic.result b/mysql-test/suite/sys_vars/r/general_log_basic.result similarity index 100% rename from mysql-test/r/general_log_basic.result rename to mysql-test/suite/sys_vars/r/general_log_basic.result diff --git a/mysql-test/r/general_log_file_basic.result b/mysql-test/suite/sys_vars/r/general_log_file_basic.result similarity index 100% rename from mysql-test/r/general_log_file_basic.result rename to mysql-test/suite/sys_vars/r/general_log_file_basic.result diff --git a/mysql-test/r/general_log_file_func.result b/mysql-test/suite/sys_vars/r/general_log_file_func.result similarity index 100% rename from mysql-test/r/general_log_file_func.result rename to mysql-test/suite/sys_vars/r/general_log_file_func.result diff --git a/mysql-test/r/general_log_func.result b/mysql-test/suite/sys_vars/r/general_log_func.result similarity index 100% rename from mysql-test/r/general_log_func.result rename to mysql-test/suite/sys_vars/r/general_log_func.result diff --git a/mysql-test/r/group_concat_max_len_basic.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result similarity index 100% rename from mysql-test/r/group_concat_max_len_basic.result rename to mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result diff --git a/mysql-test/r/group_concat_max_len_func.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_func.result similarity index 100% rename from mysql-test/r/group_concat_max_len_func.result rename to mysql-test/suite/sys_vars/r/group_concat_max_len_func.result diff --git a/mysql-test/r/have_compress_basic.result b/mysql-test/suite/sys_vars/r/have_compress_basic.result similarity index 100% rename from mysql-test/r/have_compress_basic.result rename to mysql-test/suite/sys_vars/r/have_compress_basic.result diff --git a/mysql-test/r/have_crypt_basic.result b/mysql-test/suite/sys_vars/r/have_crypt_basic.result similarity index 100% rename from mysql-test/r/have_crypt_basic.result rename to mysql-test/suite/sys_vars/r/have_crypt_basic.result diff --git a/mysql-test/r/have_csv_basic.result b/mysql-test/suite/sys_vars/r/have_csv_basic.result similarity index 100% rename from mysql-test/r/have_csv_basic.result rename to mysql-test/suite/sys_vars/r/have_csv_basic.result diff --git a/mysql-test/r/have_dynamic_loading_basic.result b/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result similarity index 100% rename from mysql-test/r/have_dynamic_loading_basic.result rename to mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result diff --git a/mysql-test/r/have_geometry_basic.result b/mysql-test/suite/sys_vars/r/have_geometry_basic.result similarity index 100% rename from mysql-test/r/have_geometry_basic.result rename to mysql-test/suite/sys_vars/r/have_geometry_basic.result diff --git a/mysql-test/r/have_innodb_basic.result b/mysql-test/suite/sys_vars/r/have_innodb_basic.result similarity index 100% rename from mysql-test/r/have_innodb_basic.result rename to mysql-test/suite/sys_vars/r/have_innodb_basic.result diff --git a/mysql-test/r/have_ndbcluster_basic.result b/mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result similarity index 100% rename from mysql-test/r/have_ndbcluster_basic.result rename to mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result diff --git a/mysql-test/r/have_openssl_basic.result b/mysql-test/suite/sys_vars/r/have_openssl_basic.result similarity index 100% rename from mysql-test/r/have_openssl_basic.result rename to mysql-test/suite/sys_vars/r/have_openssl_basic.result diff --git a/mysql-test/r/have_partitioning_basic.result b/mysql-test/suite/sys_vars/r/have_partitioning_basic.result similarity index 100% rename from mysql-test/r/have_partitioning_basic.result rename to mysql-test/suite/sys_vars/r/have_partitioning_basic.result diff --git a/mysql-test/r/have_query_cache_basic.result b/mysql-test/suite/sys_vars/r/have_query_cache_basic.result similarity index 100% rename from mysql-test/r/have_query_cache_basic.result rename to mysql-test/suite/sys_vars/r/have_query_cache_basic.result diff --git a/mysql-test/r/have_rtree_keys_basic.result b/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result similarity index 100% rename from mysql-test/r/have_rtree_keys_basic.result rename to mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result diff --git a/mysql-test/r/have_ssl_basic.result b/mysql-test/suite/sys_vars/r/have_ssl_basic.result similarity index 100% rename from mysql-test/r/have_ssl_basic.result rename to mysql-test/suite/sys_vars/r/have_ssl_basic.result diff --git a/mysql-test/r/have_symlink_basic.result b/mysql-test/suite/sys_vars/r/have_symlink_basic.result similarity index 100% rename from mysql-test/r/have_symlink_basic.result rename to mysql-test/suite/sys_vars/r/have_symlink_basic.result diff --git a/mysql-test/r/hostname_basic.result b/mysql-test/suite/sys_vars/r/hostname_basic.result similarity index 100% rename from mysql-test/r/hostname_basic.result rename to mysql-test/suite/sys_vars/r/hostname_basic.result diff --git a/mysql-test/r/identity_basic.result b/mysql-test/suite/sys_vars/r/identity_basic.result similarity index 100% rename from mysql-test/r/identity_basic.result rename to mysql-test/suite/sys_vars/r/identity_basic.result diff --git a/mysql-test/r/identity_func.result b/mysql-test/suite/sys_vars/r/identity_func.result similarity index 100% rename from mysql-test/r/identity_func.result rename to mysql-test/suite/sys_vars/r/identity_func.result diff --git a/mysql-test/r/init_connect_basic.result b/mysql-test/suite/sys_vars/r/init_connect_basic.result similarity index 100% rename from mysql-test/r/init_connect_basic.result rename to mysql-test/suite/sys_vars/r/init_connect_basic.result diff --git a/mysql-test/r/init_slave_basic.result b/mysql-test/suite/sys_vars/r/init_slave_basic.result similarity index 100% rename from mysql-test/r/init_slave_basic.result rename to mysql-test/suite/sys_vars/r/init_slave_basic.result diff --git a/mysql-test/r/innodb_additional_mem_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result similarity index 100% rename from mysql-test/r/innodb_additional_mem_pool_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result diff --git a/mysql-test/r/innodb_autoextend_increment_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result similarity index 100% rename from mysql-test/r/innodb_autoextend_increment_basic.result rename to mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result diff --git a/mysql-test/r/innodb_autoinc_lock_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result similarity index 100% rename from mysql-test/r/innodb_autoinc_lock_mode_basic.result rename to mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result diff --git a/mysql-test/r/innodb_autoinc_lock_mode_func.result b/mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result similarity index 100% rename from mysql-test/r/innodb_autoinc_lock_mode_func.result rename to mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result diff --git a/mysql-test/r/innodb_buffer_pool_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result similarity index 100% rename from mysql-test/r/innodb_buffer_pool_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result diff --git a/mysql-test/r/innodb_checksums_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result similarity index 100% rename from mysql-test/r/innodb_checksums_basic.result rename to mysql-test/suite/sys_vars/r/innodb_checksums_basic.result diff --git a/mysql-test/r/innodb_commit_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result similarity index 100% rename from mysql-test/r/innodb_commit_concurrency_basic.result rename to mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result diff --git a/mysql-test/r/innodb_data_file_path_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result similarity index 100% rename from mysql-test/r/innodb_data_file_path_basic.result rename to mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result diff --git a/mysql-test/r/innodb_data_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result similarity index 100% rename from mysql-test/r/innodb_data_home_dir_basic.result rename to mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result diff --git a/mysql-test/r/innodb_doublewrite_basic.result b/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result similarity index 100% rename from mysql-test/r/innodb_doublewrite_basic.result rename to mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result diff --git a/mysql-test/r/innodb_fast_shutdown_basic.result b/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result similarity index 100% rename from mysql-test/r/innodb_fast_shutdown_basic.result rename to mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result diff --git a/mysql-test/r/innodb_file_io_threads_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result similarity index 100% rename from mysql-test/r/innodb_file_io_threads_basic.result rename to mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result diff --git a/mysql-test/r/innodb_file_per_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result similarity index 100% rename from mysql-test/r/innodb_file_per_table_basic.result rename to mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result diff --git a/mysql-test/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result similarity index 100% rename from mysql-test/r/innodb_flush_log_at_trx_commit_basic.result rename to mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result diff --git a/mysql-test/r/innodb_flush_method_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result similarity index 100% rename from mysql-test/r/innodb_flush_method_basic.result rename to mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result diff --git a/mysql-test/r/innodb_force_recovery_basic.result b/mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result similarity index 100% rename from mysql-test/r/innodb_force_recovery_basic.result rename to mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result diff --git a/mysql-test/r/innodb_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result similarity index 100% rename from mysql-test/r/innodb_lock_wait_timeout_basic.result rename to mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result diff --git a/mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result b/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result similarity index 100% rename from mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result rename to mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result diff --git a/mysql-test/r/innodb_log_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result similarity index 100% rename from mysql-test/r/innodb_log_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result diff --git a/mysql-test/r/innodb_log_file_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result similarity index 100% rename from mysql-test/r/innodb_log_file_size_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result diff --git a/mysql-test/r/innodb_log_files_in_group_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result similarity index 100% rename from mysql-test/r/innodb_log_files_in_group_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result diff --git a/mysql-test/r/innodb_log_group_home_dir_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result similarity index 100% rename from mysql-test/r/innodb_log_group_home_dir_basic.result rename to mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result similarity index 100% rename from mysql-test/r/innodb_max_dirty_pages_pct_basic.result rename to mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result diff --git a/mysql-test/r/innodb_max_dirty_pages_pct_func.result b/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result similarity index 100% rename from mysql-test/r/innodb_max_dirty_pages_pct_func.result rename to mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result diff --git a/mysql-test/r/innodb_mirrored_log_groups_basic.result b/mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result similarity index 100% rename from mysql-test/r/innodb_mirrored_log_groups_basic.result rename to mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result diff --git a/mysql-test/r/innodb_open_files_basic.result b/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result similarity index 100% rename from mysql-test/r/innodb_open_files_basic.result rename to mysql-test/suite/sys_vars/r/innodb_open_files_basic.result diff --git a/mysql-test/r/innodb_rollback_on_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result similarity index 100% rename from mysql-test/r/innodb_rollback_on_timeout_basic.result rename to mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result diff --git a/mysql-test/r/innodb_support_xa_basic.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result similarity index 100% rename from mysql-test/r/innodb_support_xa_basic.result rename to mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result diff --git a/mysql-test/r/innodb_support_xa_func.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result similarity index 100% rename from mysql-test/r/innodb_support_xa_func.result rename to mysql-test/suite/sys_vars/r/innodb_support_xa_func.result diff --git a/mysql-test/r/innodb_table_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result similarity index 100% rename from mysql-test/r/innodb_table_locks_basic.result rename to mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result diff --git a/mysql-test/r/innodb_table_locks_func.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result similarity index 100% rename from mysql-test/r/innodb_table_locks_func.result rename to mysql-test/suite/sys_vars/r/innodb_table_locks_func.result diff --git a/mysql-test/r/innodb_thread_concurrency_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result similarity index 100% rename from mysql-test/r/innodb_thread_concurrency_basic.result rename to mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result diff --git a/mysql-test/r/innodb_thread_sleep_delay_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result similarity index 100% rename from mysql-test/r/innodb_thread_sleep_delay_basic.result rename to mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result diff --git a/mysql-test/r/insert_id_basic.result b/mysql-test/suite/sys_vars/r/insert_id_basic.result similarity index 100% rename from mysql-test/r/insert_id_basic.result rename to mysql-test/suite/sys_vars/r/insert_id_basic.result diff --git a/mysql-test/r/insert_id_func.result b/mysql-test/suite/sys_vars/r/insert_id_func.result similarity index 100% rename from mysql-test/r/insert_id_func.result rename to mysql-test/suite/sys_vars/r/insert_id_func.result diff --git a/mysql-test/r/interactive_timeout_basic.result b/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result similarity index 100% rename from mysql-test/r/interactive_timeout_basic.result rename to mysql-test/suite/sys_vars/r/interactive_timeout_basic.result diff --git a/mysql-test/r/interactive_timeout_func.result b/mysql-test/suite/sys_vars/r/interactive_timeout_func.result similarity index 100% rename from mysql-test/r/interactive_timeout_func.result rename to mysql-test/suite/sys_vars/r/interactive_timeout_func.result diff --git a/mysql-test/r/keep_files_on_create_basic.result b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result similarity index 100% rename from mysql-test/r/keep_files_on_create_basic.result rename to mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result diff --git a/mysql-test/r/key_buffer_size_func.result b/mysql-test/suite/sys_vars/r/key_buffer_size_func.result similarity index 100% rename from mysql-test/r/key_buffer_size_func.result rename to mysql-test/suite/sys_vars/r/key_buffer_size_func.result diff --git a/mysql-test/r/last_insert_id_func.result b/mysql-test/suite/sys_vars/r/last_insert_id_func.result similarity index 100% rename from mysql-test/r/last_insert_id_func.result rename to mysql-test/suite/sys_vars/r/last_insert_id_func.result diff --git a/mysql-test/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result similarity index 100% rename from mysql-test/r/lc_time_names_basic.result rename to mysql-test/suite/sys_vars/r/lc_time_names_basic.result diff --git a/mysql-test/r/lc_time_names_func.result b/mysql-test/suite/sys_vars/r/lc_time_names_func.result similarity index 100% rename from mysql-test/r/lc_time_names_func.result rename to mysql-test/suite/sys_vars/r/lc_time_names_func.result diff --git a/mysql-test/r/license_basic.result b/mysql-test/suite/sys_vars/r/license_basic.result similarity index 100% rename from mysql-test/r/license_basic.result rename to mysql-test/suite/sys_vars/r/license_basic.result diff --git a/mysql-test/r/local_infile_basic.result b/mysql-test/suite/sys_vars/r/local_infile_basic.result similarity index 100% rename from mysql-test/r/local_infile_basic.result rename to mysql-test/suite/sys_vars/r/local_infile_basic.result diff --git a/mysql-test/r/local_infile_func.result b/mysql-test/suite/sys_vars/r/local_infile_func.result similarity index 100% rename from mysql-test/r/local_infile_func.result rename to mysql-test/suite/sys_vars/r/local_infile_func.result diff --git a/mysql-test/r/log_basic.result b/mysql-test/suite/sys_vars/r/log_basic.result similarity index 100% rename from mysql-test/r/log_basic.result rename to mysql-test/suite/sys_vars/r/log_basic.result diff --git a/mysql-test/r/log_bin_trust_function_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result similarity index 100% rename from mysql-test/r/log_bin_trust_function_creators_basic.result rename to mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result diff --git a/mysql-test/r/log_bin_trust_function_creators_func.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result similarity index 100% rename from mysql-test/r/log_bin_trust_function_creators_func.result rename to mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result diff --git a/mysql-test/r/log_bin_trust_routine_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result similarity index 100% rename from mysql-test/r/log_bin_trust_routine_creators_basic.result rename to mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result diff --git a/mysql-test/r/log_output_basic.result b/mysql-test/suite/sys_vars/r/log_output_basic.result similarity index 100% rename from mysql-test/r/log_output_basic.result rename to mysql-test/suite/sys_vars/r/log_output_basic.result diff --git a/mysql-test/r/log_output_func.result b/mysql-test/suite/sys_vars/r/log_output_func.result similarity index 100% rename from mysql-test/r/log_output_func.result rename to mysql-test/suite/sys_vars/r/log_output_func.result diff --git a/mysql-test/r/log_queries_not_using_indexes_basic.result b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result similarity index 100% rename from mysql-test/r/log_queries_not_using_indexes_basic.result rename to mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result diff --git a/mysql-test/r/long_query_time_basic.result b/mysql-test/suite/sys_vars/r/long_query_time_basic.result similarity index 100% rename from mysql-test/r/long_query_time_basic.result rename to mysql-test/suite/sys_vars/r/long_query_time_basic.result diff --git a/mysql-test/r/low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result similarity index 100% rename from mysql-test/r/low_priority_updates_basic.result rename to mysql-test/suite/sys_vars/r/low_priority_updates_basic.result diff --git a/mysql-test/r/max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result similarity index 100% rename from mysql-test/r/max_allowed_packet_basic.result rename to mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result diff --git a/mysql-test/r/max_allowed_packet_func.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result similarity index 100% rename from mysql-test/r/max_allowed_packet_func.result rename to mysql-test/suite/sys_vars/r/max_allowed_packet_func.result diff --git a/mysql-test/r/max_binlog_cache_size_func.result b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result similarity index 100% rename from mysql-test/r/max_binlog_cache_size_func.result rename to mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result diff --git a/mysql-test/r/max_binlog_size_basic.result b/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result similarity index 100% rename from mysql-test/r/max_binlog_size_basic.result rename to mysql-test/suite/sys_vars/r/max_binlog_size_basic.result diff --git a/mysql-test/r/max_connections_basic.result b/mysql-test/suite/sys_vars/r/max_connections_basic.result similarity index 100% rename from mysql-test/r/max_connections_basic.result rename to mysql-test/suite/sys_vars/r/max_connections_basic.result diff --git a/mysql-test/r/max_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result similarity index 100% rename from mysql-test/r/max_delayed_threads_basic.result rename to mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result diff --git a/mysql-test/r/max_error_count_basic.result b/mysql-test/suite/sys_vars/r/max_error_count_basic.result similarity index 100% rename from mysql-test/r/max_error_count_basic.result rename to mysql-test/suite/sys_vars/r/max_error_count_basic.result diff --git a/mysql-test/r/max_insert_delayed_threads_basic.result b/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result similarity index 100% rename from mysql-test/r/max_insert_delayed_threads_basic.result rename to mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result diff --git a/mysql-test/r/max_join_size_func.result b/mysql-test/suite/sys_vars/r/max_join_size_func.result similarity index 100% rename from mysql-test/r/max_join_size_func.result rename to mysql-test/suite/sys_vars/r/max_join_size_func.result diff --git a/mysql-test/r/max_length_for_sort_data_basic.result b/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result similarity index 100% rename from mysql-test/r/max_length_for_sort_data_basic.result rename to mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result diff --git a/mysql-test/r/max_prepared_stmt_count_basic.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result similarity index 100% rename from mysql-test/r/max_prepared_stmt_count_basic.result rename to mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result diff --git a/mysql-test/r/max_prepared_stmt_count_func.result b/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result similarity index 100% rename from mysql-test/r/max_prepared_stmt_count_func.result rename to mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result diff --git a/mysql-test/r/max_relay_log_size_basic.result b/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result similarity index 100% rename from mysql-test/r/max_relay_log_size_basic.result rename to mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result diff --git a/mysql-test/r/max_seeks_for_key_func.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result similarity index 100% rename from mysql-test/r/max_seeks_for_key_func.result rename to mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result diff --git a/mysql-test/r/max_sort_length_basic.result b/mysql-test/suite/sys_vars/r/max_sort_length_basic.result similarity index 100% rename from mysql-test/r/max_sort_length_basic.result rename to mysql-test/suite/sys_vars/r/max_sort_length_basic.result diff --git a/mysql-test/r/max_sort_length_func.result b/mysql-test/suite/sys_vars/r/max_sort_length_func.result similarity index 100% rename from mysql-test/r/max_sort_length_func.result rename to mysql-test/suite/sys_vars/r/max_sort_length_func.result diff --git a/mysql-test/r/max_sp_recursion_depth_basic.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result similarity index 100% rename from mysql-test/r/max_sp_recursion_depth_basic.result rename to mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result diff --git a/mysql-test/r/max_sp_recursion_depth_func.result b/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result similarity index 100% rename from mysql-test/r/max_sp_recursion_depth_func.result rename to mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result diff --git a/mysql-test/r/max_user_connections_basic.result b/mysql-test/suite/sys_vars/r/max_user_connections_basic.result similarity index 100% rename from mysql-test/r/max_user_connections_basic.result rename to mysql-test/suite/sys_vars/r/max_user_connections_basic.result diff --git a/mysql-test/r/max_user_connections_func.result b/mysql-test/suite/sys_vars/r/max_user_connections_func.result similarity index 100% rename from mysql-test/r/max_user_connections_func.result rename to mysql-test/suite/sys_vars/r/max_user_connections_func.result diff --git a/mysql-test/r/myisam_data_pointer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result similarity index 100% rename from mysql-test/r/myisam_data_pointer_size_basic.result rename to mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result diff --git a/mysql-test/r/myisam_data_pointer_size_func.result b/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result similarity index 100% rename from mysql-test/r/myisam_data_pointer_size_func.result rename to mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result diff --git a/mysql-test/r/myisam_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result similarity index 100% rename from mysql-test/r/myisam_sort_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result diff --git a/mysql-test/r/myisam_stats_method_basic.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result similarity index 100% rename from mysql-test/r/myisam_stats_method_basic.result rename to mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result diff --git a/mysql-test/r/myisam_stats_method_func.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result similarity index 100% rename from mysql-test/r/myisam_stats_method_func.result rename to mysql-test/suite/sys_vars/r/myisam_stats_method_func.result diff --git a/mysql-test/r/myisam_use_mmap_basic.result b/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result similarity index 100% rename from mysql-test/r/myisam_use_mmap_basic.result rename to mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result diff --git a/mysql-test/r/ndb_log_update_as_write_basic.result b/mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result similarity index 100% rename from mysql-test/r/ndb_log_update_as_write_basic.result rename to mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result diff --git a/mysql-test/r/ndb_log_updated_only_basic.result b/mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result similarity index 100% rename from mysql-test/r/ndb_log_updated_only_basic.result rename to mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result diff --git a/mysql-test/r/net_buffer_length_basic.result b/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result similarity index 100% rename from mysql-test/r/net_buffer_length_basic.result rename to mysql-test/suite/sys_vars/r/net_buffer_length_basic.result diff --git a/mysql-test/r/net_read_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result similarity index 100% rename from mysql-test/r/net_read_timeout_basic.result rename to mysql-test/suite/sys_vars/r/net_read_timeout_basic.result diff --git a/mysql-test/r/net_write_timeout_basic.result b/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result similarity index 100% rename from mysql-test/r/net_write_timeout_basic.result rename to mysql-test/suite/sys_vars/r/net_write_timeout_basic.result diff --git a/mysql-test/r/new_basic.result b/mysql-test/suite/sys_vars/r/new_basic.result similarity index 100% rename from mysql-test/r/new_basic.result rename to mysql-test/suite/sys_vars/r/new_basic.result diff --git a/mysql-test/r/old_passwords_basic.result b/mysql-test/suite/sys_vars/r/old_passwords_basic.result similarity index 100% rename from mysql-test/r/old_passwords_basic.result rename to mysql-test/suite/sys_vars/r/old_passwords_basic.result diff --git a/mysql-test/r/old_passwords_func.result b/mysql-test/suite/sys_vars/r/old_passwords_func.result similarity index 100% rename from mysql-test/r/old_passwords_func.result rename to mysql-test/suite/sys_vars/r/old_passwords_func.result diff --git a/mysql-test/r/optimizer_prune_level_basic.result b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result similarity index 100% rename from mysql-test/r/optimizer_prune_level_basic.result rename to mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result diff --git a/mysql-test/r/optimizer_search_depth_basic.result b/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result similarity index 100% rename from mysql-test/r/optimizer_search_depth_basic.result rename to mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result diff --git a/mysql-test/r/preload_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result similarity index 100% rename from mysql-test/r/preload_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result diff --git a/mysql-test/r/query_cache_limit_func.result b/mysql-test/suite/sys_vars/r/query_cache_limit_func.result similarity index 100% rename from mysql-test/r/query_cache_limit_func.result rename to mysql-test/suite/sys_vars/r/query_cache_limit_func.result diff --git 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 index 1af70b3af84..1793726b2f1 100644 --- 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 @@ -1,7 +1,4 @@ SET @start_value = @@global.query_cache_size; -SELECT @start_value; -@start_value -0 '#--------------------FN_DYNVARS_133_01------------------------#' SET @@global.query_cache_size = 99; SET @@global.query_cache_size = DEFAULT; @@ -10,8 +7,8 @@ SELECT @@global.query_cache_size; 0 '#---------------------FN_DYNVARS_133_02-------------------------#' SET @@global.query_cache_size = @start_value; -SELECT @@global.query_cache_size = 0; -@@global.query_cache_size = 0 +SELECT @@global.query_cache_size = @start_value; +@@global.query_cache_size = @start_value 1 '#--------------------FN_DYNVARS_133_03------------------------#' SET @@global.query_cache_size = 0; @@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_size = @@session.query_cache_size; 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 diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result index 0d67eec1ccc..0cc508b169e 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result +++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result @@ -1,7 +1,4 @@ SET @start_value = @@global.query_cache_size; -SELECT @start_value; -@start_value -0 '#--------------------FN_DYNVARS_133_01------------------------#' SET @@global.query_cache_size = 99; SET @@global.query_cache_size = DEFAULT; @@ -10,8 +7,8 @@ SELECT @@global.query_cache_size; 0 '#---------------------FN_DYNVARS_133_02-------------------------#' SET @@global.query_cache_size = @start_value; -SELECT @@global.query_cache_size = 0; -@@global.query_cache_size = 0 +SELECT @@global.query_cache_size = @start_value; +@@global.query_cache_size = @start_value 1 '#--------------------FN_DYNVARS_133_03------------------------#' SET @@global.query_cache_size = 0; @@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_size = @@session.query_cache_size; 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 diff --git a/mysql-test/r/query_cache_type_basic.result b/mysql-test/suite/sys_vars/r/query_cache_type_basic.result similarity index 100% rename from mysql-test/r/query_cache_type_basic.result rename to mysql-test/suite/sys_vars/r/query_cache_type_basic.result diff --git a/mysql-test/r/query_cache_type_func.result b/mysql-test/suite/sys_vars/r/query_cache_type_func.result similarity index 100% rename from mysql-test/r/query_cache_type_func.result rename to mysql-test/suite/sys_vars/r/query_cache_type_func.result diff --git a/mysql-test/r/query_cache_wlock_invalidate_basic.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result similarity index 100% rename from mysql-test/r/query_cache_wlock_invalidate_basic.result rename to mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result diff --git a/mysql-test/r/query_cache_wlock_invalidate_func.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result similarity index 100% rename from mysql-test/r/query_cache_wlock_invalidate_func.result rename to mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result diff --git a/mysql-test/r/query_prealloc_size_func.result b/mysql-test/suite/sys_vars/r/query_prealloc_size_func.result similarity index 100% rename from mysql-test/r/query_prealloc_size_func.result rename to mysql-test/suite/sys_vars/r/query_prealloc_size_func.result diff --git a/mysql-test/r/read_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result similarity index 100% rename from mysql-test/r/read_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/read_buffer_size_basic.result diff --git a/mysql-test/r/read_only_basic.result b/mysql-test/suite/sys_vars/r/read_only_basic.result similarity index 100% rename from mysql-test/r/read_only_basic.result rename to mysql-test/suite/sys_vars/r/read_only_basic.result diff --git a/mysql-test/r/read_only_func.result b/mysql-test/suite/sys_vars/r/read_only_func.result similarity index 100% rename from mysql-test/r/read_only_func.result rename to mysql-test/suite/sys_vars/r/read_only_func.result diff --git a/mysql-test/r/read_rnd_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result similarity index 100% rename from mysql-test/r/read_rnd_buffer_size_basic.result rename to mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result diff --git a/mysql-test/r/relay_log_purge_basic.result b/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result similarity index 100% rename from mysql-test/r/relay_log_purge_basic.result rename to mysql-test/suite/sys_vars/r/relay_log_purge_basic.result diff --git a/mysql-test/r/rpl_init_slave_func.result b/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result similarity index 100% rename from mysql-test/r/rpl_init_slave_func.result rename to mysql-test/suite/sys_vars/r/rpl_init_slave_func.result diff --git a/mysql-test/r/rpl_max_binlog_size_func.result b/mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result similarity index 91% rename from mysql-test/r/rpl_max_binlog_size_func.result rename to mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result index 08c1ea407fd..a2ffd10d322 100644 --- a/mysql-test/r/rpl_max_binlog_size_func.result +++ b/mysql-test/suite/sys_vars/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; diff --git a/mysql-test/r/secure_auth_basic.result b/mysql-test/suite/sys_vars/r/secure_auth_basic.result similarity index 100% rename from mysql-test/r/secure_auth_basic.result rename to mysql-test/suite/sys_vars/r/secure_auth_basic.result diff --git a/mysql-test/r/secure_auth_func.result b/mysql-test/suite/sys_vars/r/secure_auth_func.result similarity index 100% rename from mysql-test/r/secure_auth_func.result rename to mysql-test/suite/sys_vars/r/secure_auth_func.result diff --git a/mysql-test/r/slave_allow_batching_basic.result b/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result similarity index 100% rename from mysql-test/r/slave_allow_batching_basic.result rename to mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result diff --git a/mysql-test/r/slave_compressed_protocol_basic.result b/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result similarity index 100% rename from mysql-test/r/slave_compressed_protocol_basic.result rename to mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result diff --git a/mysql-test/r/slave_exec_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result similarity index 100% rename from mysql-test/r/slave_exec_mode_basic.result rename to mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result diff --git a/mysql-test/r/slave_net_timeout_basic.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result similarity index 100% rename from mysql-test/r/slave_net_timeout_basic.result rename to mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result diff --git a/mysql-test/r/slow_launch_time_basic.result b/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result similarity index 100% rename from mysql-test/r/slow_launch_time_basic.result rename to mysql-test/suite/sys_vars/r/slow_launch_time_basic.result diff --git a/mysql-test/r/slow_launch_time_func.result b/mysql-test/suite/sys_vars/r/slow_launch_time_func.result similarity index 100% rename from mysql-test/r/slow_launch_time_func.result rename to mysql-test/suite/sys_vars/r/slow_launch_time_func.result diff --git a/mysql-test/r/slow_query_log_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_basic.result similarity index 100% rename from mysql-test/r/slow_query_log_basic.result rename to mysql-test/suite/sys_vars/r/slow_query_log_basic.result diff --git a/mysql-test/r/slow_query_log_file_basic.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result similarity index 100% rename from mysql-test/r/slow_query_log_file_basic.result rename to mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result diff --git a/mysql-test/r/slow_query_log_file_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_file_func.result similarity index 100% rename from mysql-test/r/slow_query_log_file_func.result rename to mysql-test/suite/sys_vars/r/slow_query_log_file_func.result diff --git a/mysql-test/r/slow_query_log_func.result b/mysql-test/suite/sys_vars/r/slow_query_log_func.result similarity index 100% rename from mysql-test/r/slow_query_log_func.result rename to mysql-test/suite/sys_vars/r/slow_query_log_func.result diff --git a/mysql-test/r/sql_auto_is_null_basic.result b/mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result similarity index 100% rename from mysql-test/r/sql_auto_is_null_basic.result rename to mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result diff --git a/mysql-test/r/sql_big_selects_basic.result b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result similarity index 100% rename from mysql-test/r/sql_big_selects_basic.result rename to mysql-test/suite/sys_vars/r/sql_big_selects_basic.result diff --git a/mysql-test/r/sql_big_selects_func.result b/mysql-test/suite/sys_vars/r/sql_big_selects_func.result similarity index 100% rename from mysql-test/r/sql_big_selects_func.result rename to mysql-test/suite/sys_vars/r/sql_big_selects_func.result diff --git a/mysql-test/r/sql_big_tables_basic.result b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result similarity index 100% rename from mysql-test/r/sql_big_tables_basic.result rename to mysql-test/suite/sys_vars/r/sql_big_tables_basic.result diff --git a/mysql-test/r/sql_big_tables_func.result b/mysql-test/suite/sys_vars/r/sql_big_tables_func.result similarity index 100% rename from mysql-test/r/sql_big_tables_func.result rename to mysql-test/suite/sys_vars/r/sql_big_tables_func.result diff --git a/mysql-test/r/sql_buffer_result_basic.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result similarity index 100% rename from mysql-test/r/sql_buffer_result_basic.result rename to mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result diff --git a/mysql-test/r/sql_buffer_result_func.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_func.result similarity index 100% rename from mysql-test/r/sql_buffer_result_func.result rename to mysql-test/suite/sys_vars/r/sql_buffer_result_func.result diff --git a/mysql-test/r/sql_log_bin_basic.result b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result similarity index 100% rename from mysql-test/r/sql_log_bin_basic.result rename to mysql-test/suite/sys_vars/r/sql_log_bin_basic.result diff --git a/mysql-test/r/sql_log_off_basic.result b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result similarity index 100% rename from mysql-test/r/sql_log_off_basic.result rename to mysql-test/suite/sys_vars/r/sql_log_off_basic.result diff --git a/mysql-test/r/sql_log_off_func.result b/mysql-test/suite/sys_vars/r/sql_log_off_func.result similarity index 100% rename from mysql-test/r/sql_log_off_func.result rename to mysql-test/suite/sys_vars/r/sql_log_off_func.result diff --git a/mysql-test/r/sql_low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result similarity index 100% rename from mysql-test/r/sql_low_priority_updates_basic.result rename to mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result diff --git a/mysql-test/r/sql_low_priority_updates_func.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result similarity index 100% rename from mysql-test/r/sql_low_priority_updates_func.result rename to mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result diff --git a/mysql-test/r/sql_max_join_size_func.result b/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result similarity index 100% rename from mysql-test/r/sql_max_join_size_func.result rename to mysql-test/suite/sys_vars/r/sql_max_join_size_func.result diff --git a/mysql-test/r/sql_mode_basic.result b/mysql-test/suite/sys_vars/r/sql_mode_basic.result similarity index 100% rename from mysql-test/r/sql_mode_basic.result rename to mysql-test/suite/sys_vars/r/sql_mode_basic.result diff --git a/mysql-test/r/sql_mode_func.result b/mysql-test/suite/sys_vars/r/sql_mode_func.result similarity index 100% rename from mysql-test/r/sql_mode_func.result rename to mysql-test/suite/sys_vars/r/sql_mode_func.result diff --git a/mysql-test/r/sql_notes_basic.result b/mysql-test/suite/sys_vars/r/sql_notes_basic.result similarity index 100% rename from mysql-test/r/sql_notes_basic.result rename to mysql-test/suite/sys_vars/r/sql_notes_basic.result diff --git a/mysql-test/r/sql_notes_func.result b/mysql-test/suite/sys_vars/r/sql_notes_func.result similarity index 100% rename from mysql-test/r/sql_notes_func.result rename to mysql-test/suite/sys_vars/r/sql_notes_func.result diff --git a/mysql-test/r/sql_quote_show_create_basic.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result similarity index 100% rename from mysql-test/r/sql_quote_show_create_basic.result rename to mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result diff --git a/mysql-test/r/sql_quote_show_create_func.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result similarity index 100% rename from mysql-test/r/sql_quote_show_create_func.result rename to mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result diff --git a/mysql-test/r/sql_safe_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result similarity index 100% rename from mysql-test/r/sql_safe_updates_basic.result rename to mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result diff --git a/mysql-test/r/sql_safe_updates_func.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_func.result similarity index 100% rename from mysql-test/r/sql_safe_updates_func.result rename to mysql-test/suite/sys_vars/r/sql_safe_updates_func.result diff --git a/mysql-test/r/sql_select_limit_func.result b/mysql-test/suite/sys_vars/r/sql_select_limit_func.result similarity index 100% rename from mysql-test/r/sql_select_limit_func.result rename to mysql-test/suite/sys_vars/r/sql_select_limit_func.result diff --git a/mysql-test/r/sql_slave_skip_counter_basic.result b/mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result similarity index 100% rename from mysql-test/r/sql_slave_skip_counter_basic.result rename to mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result diff --git a/mysql-test/r/sql_warnings_basic.result b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result similarity index 100% rename from mysql-test/r/sql_warnings_basic.result rename to mysql-test/suite/sys_vars/r/sql_warnings_basic.result diff --git a/mysql-test/r/sql_warnings_func.result b/mysql-test/suite/sys_vars/r/sql_warnings_func.result similarity index 100% rename from mysql-test/r/sql_warnings_func.result rename to mysql-test/suite/sys_vars/r/sql_warnings_func.result diff --git a/mysql-test/r/ssl_ca_basic.result b/mysql-test/suite/sys_vars/r/ssl_ca_basic.result similarity index 100% rename from mysql-test/r/ssl_ca_basic.result rename to mysql-test/suite/sys_vars/r/ssl_ca_basic.result diff --git a/mysql-test/r/ssl_capath_basic.result b/mysql-test/suite/sys_vars/r/ssl_capath_basic.result similarity index 100% rename from mysql-test/r/ssl_capath_basic.result rename to mysql-test/suite/sys_vars/r/ssl_capath_basic.result diff --git a/mysql-test/r/ssl_cert_basic.result b/mysql-test/suite/sys_vars/r/ssl_cert_basic.result similarity index 100% rename from mysql-test/r/ssl_cert_basic.result rename to mysql-test/suite/sys_vars/r/ssl_cert_basic.result diff --git a/mysql-test/r/ssl_cipher_basic.result b/mysql-test/suite/sys_vars/r/ssl_cipher_basic.result similarity index 100% rename from mysql-test/r/ssl_cipher_basic.result rename to mysql-test/suite/sys_vars/r/ssl_cipher_basic.result diff --git a/mysql-test/r/ssl_key_basic.result b/mysql-test/suite/sys_vars/r/ssl_key_basic.result similarity index 100% rename from mysql-test/r/ssl_key_basic.result rename to mysql-test/suite/sys_vars/r/ssl_key_basic.result diff --git a/mysql-test/r/storage_engine_basic.result b/mysql-test/suite/sys_vars/r/storage_engine_basic.result similarity index 100% rename from mysql-test/r/storage_engine_basic.result rename to mysql-test/suite/sys_vars/r/storage_engine_basic.result diff --git a/mysql-test/r/sync_frm_basic.result b/mysql-test/suite/sys_vars/r/sync_frm_basic.result similarity index 100% rename from mysql-test/r/sync_frm_basic.result rename to mysql-test/suite/sys_vars/r/sync_frm_basic.result diff --git a/mysql-test/r/system_time_zone_basic.result b/mysql-test/suite/sys_vars/r/system_time_zone_basic.result similarity index 100% rename from mysql-test/r/system_time_zone_basic.result rename to mysql-test/suite/sys_vars/r/system_time_zone_basic.result diff --git a/mysql-test/r/table_definition_cache_basic.result b/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result similarity index 100% rename from mysql-test/r/table_definition_cache_basic.result rename to mysql-test/suite/sys_vars/r/table_definition_cache_basic.result diff --git a/mysql-test/r/table_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result similarity index 100% rename from mysql-test/r/table_lock_wait_timeout_basic.result rename to mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result diff --git a/mysql-test/r/table_open_cache_basic.result b/mysql-test/suite/sys_vars/r/table_open_cache_basic.result similarity index 100% rename from mysql-test/r/table_open_cache_basic.result rename to mysql-test/suite/sys_vars/r/table_open_cache_basic.result diff --git a/mysql-test/r/thread_cache_size_func.result b/mysql-test/suite/sys_vars/r/thread_cache_size_func.result similarity index 100% rename from mysql-test/r/thread_cache_size_func.result rename to mysql-test/suite/sys_vars/r/thread_cache_size_func.result diff --git a/mysql-test/r/thread_handling_basic.result b/mysql-test/suite/sys_vars/r/thread_handling_basic.result similarity index 100% rename from mysql-test/r/thread_handling_basic.result rename to mysql-test/suite/sys_vars/r/thread_handling_basic.result diff --git a/mysql-test/r/time_zone_basic.result b/mysql-test/suite/sys_vars/r/time_zone_basic.result similarity index 100% rename from mysql-test/r/time_zone_basic.result rename to mysql-test/suite/sys_vars/r/time_zone_basic.result diff --git a/mysql-test/r/time_zone_func.result b/mysql-test/suite/sys_vars/r/time_zone_func.result similarity index 100% rename from mysql-test/r/time_zone_func.result rename to mysql-test/suite/sys_vars/r/time_zone_func.result diff --git a/mysql-test/r/timed_mutexes_basic.result b/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result similarity index 100% rename from mysql-test/r/timed_mutexes_basic.result rename to mysql-test/suite/sys_vars/r/timed_mutexes_basic.result diff --git a/mysql-test/suite/sys_vars/r/timestamp_basic_32.result b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result index cc4f0324c0f..a8be2201e68 100644 --- a/mysql-test/suite/sys_vars/r/timestamp_basic_32.result +++ b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result @@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp' SET @@timestamp = 9999999999999999999999; ERROR 42000: Incorrect argument type to variable 'timestamp' '#----------------------FN_DYNVARS_001_06------------------------#' -SELECT @@timestamp = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='timestamp'; -@@timestamp = VARIABLE_VALUE -1 '#---------------------FN_DYNVARS_001_08-------------------------#' SET @@timestamp = OFF; ERROR 42000: Incorrect argument type to variable 'timestamp' diff --git a/mysql-test/suite/sys_vars/r/timestamp_basic_64.result b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result index df877cd455b..824a3ea5529 100644 --- a/mysql-test/suite/sys_vars/r/timestamp_basic_64.result +++ b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result @@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp' SET @@timestamp = 9999999999999999999999; ERROR 42000: Incorrect argument type to variable 'timestamp' '#----------------------FN_DYNVARS_001_06------------------------#' -SELECT @@timestamp = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='timestamp'; -@@timestamp = VARIABLE_VALUE -1 '#---------------------FN_DYNVARS_001_08-------------------------#' SET @@timestamp = OFF; ERROR 42000: Incorrect argument type to variable 'timestamp' diff --git a/mysql-test/r/timestamp_func.result b/mysql-test/suite/sys_vars/r/timestamp_func.result similarity index 100% rename from mysql-test/r/timestamp_func.result rename to mysql-test/suite/sys_vars/r/timestamp_func.result diff --git a/mysql-test/r/timestamp_sysdate_is_now_func.result b/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result similarity index 100% rename from mysql-test/r/timestamp_sysdate_is_now_func.result rename to mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result diff --git a/mysql-test/r/tmpdir_basic.result b/mysql-test/suite/sys_vars/r/tmpdir_basic.result similarity index 100% rename from mysql-test/r/tmpdir_basic.result rename to mysql-test/suite/sys_vars/r/tmpdir_basic.result diff --git a/mysql-test/r/tx_isolation_basic.result b/mysql-test/suite/sys_vars/r/tx_isolation_basic.result similarity index 100% rename from mysql-test/r/tx_isolation_basic.result rename to mysql-test/suite/sys_vars/r/tx_isolation_basic.result diff --git a/mysql-test/r/tx_isolation_func.result b/mysql-test/suite/sys_vars/r/tx_isolation_func.result similarity index 100% rename from mysql-test/r/tx_isolation_func.result rename to mysql-test/suite/sys_vars/r/tx_isolation_func.result diff --git a/mysql-test/r/unique_checks_basic.result b/mysql-test/suite/sys_vars/r/unique_checks_basic.result similarity index 100% rename from mysql-test/r/unique_checks_basic.result rename to mysql-test/suite/sys_vars/r/unique_checks_basic.result diff --git a/mysql-test/r/updatable_views_with_limit_basic.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result similarity index 100% rename from mysql-test/r/updatable_views_with_limit_basic.result rename to mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result diff --git a/mysql-test/r/updatable_views_with_limit_func.result b/mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result similarity index 100% rename from mysql-test/r/updatable_views_with_limit_func.result rename to mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result diff --git a/mysql-test/r/version_basic.result b/mysql-test/suite/sys_vars/r/version_basic.result similarity index 100% rename from mysql-test/r/version_basic.result rename to mysql-test/suite/sys_vars/r/version_basic.result diff --git a/mysql-test/r/version_comment_basic.result b/mysql-test/suite/sys_vars/r/version_comment_basic.result similarity index 100% rename from mysql-test/r/version_comment_basic.result rename to mysql-test/suite/sys_vars/r/version_comment_basic.result diff --git a/mysql-test/r/version_compile_machine_basic.result b/mysql-test/suite/sys_vars/r/version_compile_machine_basic.result similarity index 100% rename from mysql-test/r/version_compile_machine_basic.result rename to mysql-test/suite/sys_vars/r/version_compile_machine_basic.result diff --git a/mysql-test/r/version_compile_os_basic.result b/mysql-test/suite/sys_vars/r/version_compile_os_basic.result similarity index 100% rename from mysql-test/r/version_compile_os_basic.result rename to mysql-test/suite/sys_vars/r/version_compile_os_basic.result diff --git a/mysql-test/r/wait_timeout_func.result b/mysql-test/suite/sys_vars/r/wait_timeout_func.result similarity index 100% rename from mysql-test/r/wait_timeout_func.result rename to mysql-test/suite/sys_vars/r/wait_timeout_func.result diff --git a/mysql-test/r/warning_count_basic.result b/mysql-test/suite/sys_vars/r/warning_count_basic.result similarity index 100% rename from mysql-test/r/warning_count_basic.result rename to mysql-test/suite/sys_vars/r/warning_count_basic.result diff --git a/mysql-test/t/auto_commit_basic.test b/mysql-test/suite/sys_vars/t/auto_commit_basic.test similarity index 100% rename from mysql-test/t/auto_commit_basic.test rename to mysql-test/suite/sys_vars/t/auto_commit_basic.test diff --git a/mysql-test/t/auto_increment_increment_basic.test b/mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test similarity index 100% rename from mysql-test/t/auto_increment_increment_basic.test rename to mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test diff --git a/mysql-test/t/auto_increment_increment_func.test b/mysql-test/suite/sys_vars/t/auto_increment_increment_func.test similarity index 100% rename from mysql-test/t/auto_increment_increment_func.test rename to mysql-test/suite/sys_vars/t/auto_increment_increment_func.test diff --git a/mysql-test/t/auto_increment_offset_basic.test b/mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test similarity index 100% rename from mysql-test/t/auto_increment_offset_basic.test rename to mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test diff --git a/mysql-test/t/auto_increment_offset_func.test b/mysql-test/suite/sys_vars/t/auto_increment_offset_func.test similarity index 100% rename from mysql-test/t/auto_increment_offset_func.test rename to mysql-test/suite/sys_vars/t/auto_increment_offset_func.test diff --git a/mysql-test/t/autocommit_func-master.opt b/mysql-test/suite/sys_vars/t/autocommit_func-master.opt similarity index 100% rename from mysql-test/t/autocommit_func-master.opt rename to mysql-test/suite/sys_vars/t/autocommit_func-master.opt diff --git a/mysql-test/t/autocommit_func.test b/mysql-test/suite/sys_vars/t/autocommit_func.test similarity index 100% rename from mysql-test/t/autocommit_func.test rename to mysql-test/suite/sys_vars/t/autocommit_func.test diff --git a/mysql-test/t/automatic_sp_privileges_basic.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test similarity index 100% rename from mysql-test/t/automatic_sp_privileges_basic.test rename to mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test diff --git a/mysql-test/t/automatic_sp_privileges_func.test b/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test similarity index 100% rename from mysql-test/t/automatic_sp_privileges_func.test rename to mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test diff --git a/mysql-test/t/basedir_basic.test b/mysql-test/suite/sys_vars/t/basedir_basic.test similarity index 100% rename from mysql-test/t/basedir_basic.test rename to mysql-test/suite/sys_vars/t/basedir_basic.test diff --git a/mysql-test/t/big_tables_basic.test b/mysql-test/suite/sys_vars/t/big_tables_basic.test similarity index 100% rename from mysql-test/t/big_tables_basic.test rename to mysql-test/suite/sys_vars/t/big_tables_basic.test diff --git a/mysql-test/t/binlog_format_basic.test b/mysql-test/suite/sys_vars/t/binlog_format_basic.test similarity index 100% rename from mysql-test/t/binlog_format_basic.test rename to mysql-test/suite/sys_vars/t/binlog_format_basic.test diff --git a/mysql-test/t/character_set_client_basic.test b/mysql-test/suite/sys_vars/t/character_set_client_basic.test similarity index 99% rename from mysql-test/t/character_set_client_basic.test rename to mysql-test/suite/sys_vars/t/character_set_client_basic.test index 69e4c07dcd8..177a663c112 100644 --- a/mysql-test/t/character_set_client_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' ################################################################################ diff --git a/mysql-test/t/character_set_client_func.test b/mysql-test/suite/sys_vars/t/character_set_client_func.test similarity index 100% rename from mysql-test/t/character_set_client_func.test rename to mysql-test/suite/sys_vars/t/character_set_client_func.test diff --git a/mysql-test/t/character_set_connection_basic.test b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test similarity index 99% rename from mysql-test/t/character_set_connection_basic.test rename to mysql-test/suite/sys_vars/t/character_set_connection_basic.test index 509f8d0d346..5e28d43ce3e 100644 --- a/mysql-test/t/character_set_connection_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_connection_func.test b/mysql-test/suite/sys_vars/t/character_set_connection_func.test similarity index 100% rename from mysql-test/t/character_set_connection_func.test rename to mysql-test/suite/sys_vars/t/character_set_connection_func.test diff --git a/mysql-test/t/character_set_database_basic.test b/mysql-test/suite/sys_vars/t/character_set_database_basic.test similarity index 99% rename from mysql-test/t/character_set_database_basic.test rename to mysql-test/suite/sys_vars/t/character_set_database_basic.test index 9690fb84b5a..08069c00ae0 100644 --- a/mysql-test/t/character_set_database_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_database_func.test b/mysql-test/suite/sys_vars/t/character_set_database_func.test similarity index 100% rename from mysql-test/t/character_set_database_func.test rename to mysql-test/suite/sys_vars/t/character_set_database_func.test diff --git a/mysql-test/t/character_set_filesystem_basic.test b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test similarity index 99% rename from mysql-test/t/character_set_filesystem_basic.test rename to mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test index 0117145a06b..3ba9c269a84 100644 --- a/mysql-test/t/character_set_filesystem_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_filesystem_func-master.opt b/mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt similarity index 100% rename from mysql-test/t/character_set_filesystem_func-master.opt rename to mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt diff --git a/mysql-test/t/character_set_results_basic.test b/mysql-test/suite/sys_vars/t/character_set_results_basic.test similarity index 99% rename from mysql-test/t/character_set_results_basic.test rename to mysql-test/suite/sys_vars/t/character_set_results_basic.test index aae05c824d1..98635c00287 100644 --- a/mysql-test/t/character_set_results_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_results_func.test b/mysql-test/suite/sys_vars/t/character_set_results_func.test similarity index 100% rename from mysql-test/t/character_set_results_func.test rename to mysql-test/suite/sys_vars/t/character_set_results_func.test diff --git a/mysql-test/t/character_set_server_basic.test b/mysql-test/suite/sys_vars/t/character_set_server_basic.test similarity index 99% rename from mysql-test/t/character_set_server_basic.test rename to mysql-test/suite/sys_vars/t/character_set_server_basic.test index 2b3c078363a..21eb3fb36dc 100644 --- a/mysql-test/t/character_set_server_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/character_set_server_func.test b/mysql-test/suite/sys_vars/t/character_set_server_func.test similarity index 100% rename from mysql-test/t/character_set_server_func.test rename to mysql-test/suite/sys_vars/t/character_set_server_func.test diff --git a/mysql-test/t/character_set_system_basic.test b/mysql-test/suite/sys_vars/t/character_set_system_basic.test similarity index 100% rename from mysql-test/t/character_set_system_basic.test rename to mysql-test/suite/sys_vars/t/character_set_system_basic.test diff --git a/mysql-test/t/collation_connection_basic.test b/mysql-test/suite/sys_vars/t/collation_connection_basic.test similarity index 99% rename from mysql-test/t/collation_connection_basic.test rename to mysql-test/suite/sys_vars/t/collation_connection_basic.test index f3544dd306e..bf82ea321b7 100644 --- a/mysql-test/t/collation_connection_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/collation_connection_func.test b/mysql-test/suite/sys_vars/t/collation_connection_func.test similarity index 100% rename from mysql-test/t/collation_connection_func.test rename to mysql-test/suite/sys_vars/t/collation_connection_func.test diff --git a/mysql-test/t/collation_database_basic.test b/mysql-test/suite/sys_vars/t/collation_database_basic.test similarity index 99% rename from mysql-test/t/collation_database_basic.test rename to mysql-test/suite/sys_vars/t/collation_database_basic.test index c130e276084..557f32b86a0 100644 --- a/mysql-test/t/collation_database_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/collation_database_func.test b/mysql-test/suite/sys_vars/t/collation_database_func.test similarity index 100% rename from mysql-test/t/collation_database_func.test rename to mysql-test/suite/sys_vars/t/collation_database_func.test diff --git a/mysql-test/t/collation_server_basic.test b/mysql-test/suite/sys_vars/t/collation_server_basic.test similarity index 99% rename from mysql-test/t/collation_server_basic.test rename to mysql-test/suite/sys_vars/t/collation_server_basic.test index c4b469007e5..a8af13c13ae 100644 --- a/mysql-test/t/collation_server_basic.test +++ b/mysql-test/suite/sys_vars/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-------------------------#' diff --git a/mysql-test/t/collation_server_func.test b/mysql-test/suite/sys_vars/t/collation_server_func.test similarity index 100% rename from mysql-test/t/collation_server_func.test rename to mysql-test/suite/sys_vars/t/collation_server_func.test diff --git a/mysql-test/t/completion_type_basic.test b/mysql-test/suite/sys_vars/t/completion_type_basic.test similarity index 100% rename from mysql-test/t/completion_type_basic.test rename to mysql-test/suite/sys_vars/t/completion_type_basic.test diff --git a/mysql-test/t/completion_type_func-master.opt b/mysql-test/suite/sys_vars/t/completion_type_func-master.opt similarity index 100% rename from mysql-test/t/completion_type_func-master.opt rename to mysql-test/suite/sys_vars/t/completion_type_func-master.opt diff --git a/mysql-test/t/completion_type_func.test b/mysql-test/suite/sys_vars/t/completion_type_func.test similarity index 100% rename from mysql-test/t/completion_type_func.test rename to mysql-test/suite/sys_vars/t/completion_type_func.test diff --git a/mysql-test/t/concurrent_insert_basic.test b/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test similarity index 100% rename from mysql-test/t/concurrent_insert_basic.test rename to mysql-test/suite/sys_vars/t/concurrent_insert_basic.test diff --git a/mysql-test/t/concurrent_insert_func.test b/mysql-test/suite/sys_vars/t/concurrent_insert_func.test similarity index 100% rename from mysql-test/t/concurrent_insert_func.test rename to mysql-test/suite/sys_vars/t/concurrent_insert_func.test diff --git a/mysql-test/t/connect_timeout_basic.test b/mysql-test/suite/sys_vars/t/connect_timeout_basic.test similarity index 100% rename from mysql-test/t/connect_timeout_basic.test rename to mysql-test/suite/sys_vars/t/connect_timeout_basic.test diff --git a/mysql-test/t/datadir_basic.test b/mysql-test/suite/sys_vars/t/datadir_basic.test similarity index 100% rename from mysql-test/t/datadir_basic.test rename to mysql-test/suite/sys_vars/t/datadir_basic.test diff --git a/mysql-test/t/default_week_format_basic.test b/mysql-test/suite/sys_vars/t/default_week_format_basic.test similarity index 100% rename from mysql-test/t/default_week_format_basic.test rename to mysql-test/suite/sys_vars/t/default_week_format_basic.test diff --git a/mysql-test/t/default_week_format_func.test b/mysql-test/suite/sys_vars/t/default_week_format_func.test similarity index 100% rename from mysql-test/t/default_week_format_func.test rename to mysql-test/suite/sys_vars/t/default_week_format_func.test diff --git a/mysql-test/t/delay_key_write_basic.test b/mysql-test/suite/sys_vars/t/delay_key_write_basic.test similarity index 100% rename from mysql-test/t/delay_key_write_basic.test rename to mysql-test/suite/sys_vars/t/delay_key_write_basic.test diff --git a/mysql-test/t/delay_key_write_func-master.opt b/mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt similarity index 100% rename from mysql-test/t/delay_key_write_func-master.opt rename to mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt diff --git a/mysql-test/t/delay_key_write_func.test b/mysql-test/suite/sys_vars/t/delay_key_write_func.test similarity index 100% rename from mysql-test/t/delay_key_write_func.test rename to mysql-test/suite/sys_vars/t/delay_key_write_func.test diff --git a/mysql-test/t/delayed_insert_limit_func.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test similarity index 100% rename from mysql-test/t/delayed_insert_limit_func.test rename to mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test diff --git a/mysql-test/t/delayed_insert_timeout_basic.test b/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test similarity index 100% rename from mysql-test/t/delayed_insert_timeout_basic.test rename to mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test diff --git a/mysql-test/t/div_precision_increment_basic.test b/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test similarity index 100% rename from mysql-test/t/div_precision_increment_basic.test rename to mysql-test/suite/sys_vars/t/div_precision_increment_basic.test diff --git a/mysql-test/t/div_precision_increment_func.test b/mysql-test/suite/sys_vars/t/div_precision_increment_func.test similarity index 100% rename from mysql-test/t/div_precision_increment_func.test rename to mysql-test/suite/sys_vars/t/div_precision_increment_func.test diff --git a/mysql-test/t/engine_condition_pushdown_basic.test b/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test similarity index 100% rename from mysql-test/t/engine_condition_pushdown_basic.test rename to mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test diff --git a/mysql-test/t/error_count_basic.test b/mysql-test/suite/sys_vars/t/error_count_basic.test similarity index 100% rename from mysql-test/t/error_count_basic.test rename to mysql-test/suite/sys_vars/t/error_count_basic.test diff --git a/mysql-test/t/event_scheduler_basic.test b/mysql-test/suite/sys_vars/t/event_scheduler_basic.test similarity index 100% rename from mysql-test/t/event_scheduler_basic.test rename to mysql-test/suite/sys_vars/t/event_scheduler_basic.test diff --git a/mysql-test/t/event_scheduler_func.test b/mysql-test/suite/sys_vars/t/event_scheduler_func.test similarity index 100% rename from mysql-test/t/event_scheduler_func.test rename to mysql-test/suite/sys_vars/t/event_scheduler_func.test diff --git a/mysql-test/t/expire_logs_days_basic.test b/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test similarity index 100% rename from mysql-test/t/expire_logs_days_basic.test rename to mysql-test/suite/sys_vars/t/expire_logs_days_basic.test diff --git a/mysql-test/t/flush_basic.test b/mysql-test/suite/sys_vars/t/flush_basic.test similarity index 100% rename from mysql-test/t/flush_basic.test rename to mysql-test/suite/sys_vars/t/flush_basic.test diff --git a/mysql-test/t/foreign_key_checks_basic.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test similarity index 100% rename from mysql-test/t/foreign_key_checks_basic.test rename to mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test diff --git a/mysql-test/t/foreign_key_checks_func.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test similarity index 100% rename from mysql-test/t/foreign_key_checks_func.test rename to mysql-test/suite/sys_vars/t/foreign_key_checks_func.test diff --git a/mysql-test/t/ft_boolean_syntax_basic.test b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test similarity index 100% rename from mysql-test/t/ft_boolean_syntax_basic.test rename to mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test diff --git a/mysql-test/t/ft_boolean_syntax_func.test b/mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test similarity index 100% rename from mysql-test/t/ft_boolean_syntax_func.test rename to mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test diff --git a/mysql-test/t/general_log_basic.test b/mysql-test/suite/sys_vars/t/general_log_basic.test similarity index 100% rename from mysql-test/t/general_log_basic.test rename to mysql-test/suite/sys_vars/t/general_log_basic.test diff --git a/mysql-test/t/general_log_file_basic-master.opt b/mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt similarity index 100% rename from mysql-test/t/general_log_file_basic-master.opt rename to mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt diff --git a/mysql-test/t/general_log_file_basic.test b/mysql-test/suite/sys_vars/t/general_log_file_basic.test similarity index 100% rename from mysql-test/t/general_log_file_basic.test rename to mysql-test/suite/sys_vars/t/general_log_file_basic.test diff --git a/mysql-test/t/general_log_file_func-master.opt b/mysql-test/suite/sys_vars/t/general_log_file_func-master.opt similarity index 100% rename from mysql-test/t/general_log_file_func-master.opt rename to mysql-test/suite/sys_vars/t/general_log_file_func-master.opt diff --git a/mysql-test/t/general_log_file_func.test b/mysql-test/suite/sys_vars/t/general_log_file_func.test similarity index 100% rename from mysql-test/t/general_log_file_func.test rename to mysql-test/suite/sys_vars/t/general_log_file_func.test diff --git a/mysql-test/t/general_log_func.test b/mysql-test/suite/sys_vars/t/general_log_func.test similarity index 100% rename from mysql-test/t/general_log_func.test rename to mysql-test/suite/sys_vars/t/general_log_func.test diff --git a/mysql-test/t/group_concat_max_len_basic.test b/mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test similarity index 100% rename from mysql-test/t/group_concat_max_len_basic.test rename to mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test diff --git a/mysql-test/t/group_concat_max_len_func.test b/mysql-test/suite/sys_vars/t/group_concat_max_len_func.test similarity index 100% rename from mysql-test/t/group_concat_max_len_func.test rename to mysql-test/suite/sys_vars/t/group_concat_max_len_func.test diff --git a/mysql-test/t/have_compress_basic.test b/mysql-test/suite/sys_vars/t/have_compress_basic.test similarity index 100% rename from mysql-test/t/have_compress_basic.test rename to mysql-test/suite/sys_vars/t/have_compress_basic.test diff --git a/mysql-test/t/have_crypt_basic.test b/mysql-test/suite/sys_vars/t/have_crypt_basic.test similarity index 100% rename from mysql-test/t/have_crypt_basic.test rename to mysql-test/suite/sys_vars/t/have_crypt_basic.test diff --git a/mysql-test/t/have_csv_basic.test b/mysql-test/suite/sys_vars/t/have_csv_basic.test similarity index 100% rename from mysql-test/t/have_csv_basic.test rename to mysql-test/suite/sys_vars/t/have_csv_basic.test diff --git a/mysql-test/t/have_dynamic_loading_basic.test b/mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test similarity index 100% rename from mysql-test/t/have_dynamic_loading_basic.test rename to mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test diff --git a/mysql-test/t/have_geometry_basic.test b/mysql-test/suite/sys_vars/t/have_geometry_basic.test similarity index 100% rename from mysql-test/t/have_geometry_basic.test rename to mysql-test/suite/sys_vars/t/have_geometry_basic.test diff --git a/mysql-test/t/have_innodb_basic.test b/mysql-test/suite/sys_vars/t/have_innodb_basic.test similarity index 100% rename from mysql-test/t/have_innodb_basic.test rename to mysql-test/suite/sys_vars/t/have_innodb_basic.test diff --git a/mysql-test/t/have_ndbcluster_basic.test b/mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test similarity index 100% rename from mysql-test/t/have_ndbcluster_basic.test rename to mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test diff --git a/mysql-test/t/have_openssl_basic.test b/mysql-test/suite/sys_vars/t/have_openssl_basic.test similarity index 100% rename from mysql-test/t/have_openssl_basic.test rename to mysql-test/suite/sys_vars/t/have_openssl_basic.test diff --git a/mysql-test/t/have_partitioning_basic.test b/mysql-test/suite/sys_vars/t/have_partitioning_basic.test similarity index 100% rename from mysql-test/t/have_partitioning_basic.test rename to mysql-test/suite/sys_vars/t/have_partitioning_basic.test diff --git a/mysql-test/t/have_query_cache_basic.test b/mysql-test/suite/sys_vars/t/have_query_cache_basic.test similarity index 100% rename from mysql-test/t/have_query_cache_basic.test rename to mysql-test/suite/sys_vars/t/have_query_cache_basic.test diff --git a/mysql-test/t/have_rtree_keys_basic.test b/mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test similarity index 100% rename from mysql-test/t/have_rtree_keys_basic.test rename to mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test diff --git a/mysql-test/t/have_ssl_basic.test b/mysql-test/suite/sys_vars/t/have_ssl_basic.test similarity index 100% rename from mysql-test/t/have_ssl_basic.test rename to mysql-test/suite/sys_vars/t/have_ssl_basic.test diff --git a/mysql-test/t/have_symlink_basic.test b/mysql-test/suite/sys_vars/t/have_symlink_basic.test similarity index 100% rename from mysql-test/t/have_symlink_basic.test rename to mysql-test/suite/sys_vars/t/have_symlink_basic.test diff --git a/mysql-test/t/hostname_basic.test b/mysql-test/suite/sys_vars/t/hostname_basic.test similarity index 100% rename from mysql-test/t/hostname_basic.test rename to mysql-test/suite/sys_vars/t/hostname_basic.test diff --git a/mysql-test/t/identity_basic.test b/mysql-test/suite/sys_vars/t/identity_basic.test similarity index 100% rename from mysql-test/t/identity_basic.test rename to mysql-test/suite/sys_vars/t/identity_basic.test diff --git a/mysql-test/t/identity_func-master.opt b/mysql-test/suite/sys_vars/t/identity_func-master.opt similarity index 100% rename from mysql-test/t/identity_func-master.opt rename to mysql-test/suite/sys_vars/t/identity_func-master.opt diff --git a/mysql-test/t/identity_func.test b/mysql-test/suite/sys_vars/t/identity_func.test similarity index 100% rename from mysql-test/t/identity_func.test rename to mysql-test/suite/sys_vars/t/identity_func.test diff --git a/mysql-test/t/init_connect_basic.test b/mysql-test/suite/sys_vars/t/init_connect_basic.test similarity index 100% rename from mysql-test/t/init_connect_basic.test rename to mysql-test/suite/sys_vars/t/init_connect_basic.test diff --git a/mysql-test/t/init_slave_basic.test b/mysql-test/suite/sys_vars/t/init_slave_basic.test similarity index 100% rename from mysql-test/t/init_slave_basic.test rename to mysql-test/suite/sys_vars/t/init_slave_basic.test diff --git a/mysql-test/t/innodb_additional_mem_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test similarity index 100% rename from mysql-test/t/innodb_additional_mem_pool_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test diff --git a/mysql-test/t/innodb_autoextend_increment_basic.test b/mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test similarity index 100% rename from mysql-test/t/innodb_autoextend_increment_basic.test rename to mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test diff --git a/mysql-test/t/innodb_autoinc_lock_mode_basic.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test similarity index 100% rename from mysql-test/t/innodb_autoinc_lock_mode_basic.test rename to mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func-master.opt b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt similarity index 100% rename from mysql-test/t/innodb_autoinc_lock_mode_func-master.opt rename to mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt diff --git a/mysql-test/t/innodb_autoinc_lock_mode_func.test b/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test similarity index 100% rename from mysql-test/t/innodb_autoinc_lock_mode_func.test rename to mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test diff --git a/mysql-test/t/innodb_buffer_pool_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test similarity index 100% rename from mysql-test/t/innodb_buffer_pool_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test diff --git a/mysql-test/t/innodb_checksums_basic.test b/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test similarity index 100% rename from mysql-test/t/innodb_checksums_basic.test rename to mysql-test/suite/sys_vars/t/innodb_checksums_basic.test diff --git a/mysql-test/t/innodb_commit_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test similarity index 100% rename from mysql-test/t/innodb_commit_concurrency_basic.test rename to mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test diff --git a/mysql-test/t/innodb_data_file_path_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test similarity index 100% rename from mysql-test/t/innodb_data_file_path_basic.test rename to mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test diff --git a/mysql-test/t/innodb_data_home_dir_basic.test b/mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test similarity index 100% rename from mysql-test/t/innodb_data_home_dir_basic.test rename to mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test diff --git a/mysql-test/t/innodb_doublewrite_basic.test b/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test similarity index 100% rename from mysql-test/t/innodb_doublewrite_basic.test rename to mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test diff --git a/mysql-test/t/innodb_fast_shutdown_basic.test b/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test similarity index 100% rename from mysql-test/t/innodb_fast_shutdown_basic.test rename to mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test diff --git a/mysql-test/t/innodb_file_io_threads_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test similarity index 100% rename from mysql-test/t/innodb_file_io_threads_basic.test rename to mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test diff --git a/mysql-test/t/innodb_file_per_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test similarity index 100% rename from mysql-test/t/innodb_file_per_table_basic.test rename to mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test diff --git a/mysql-test/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test similarity index 100% rename from mysql-test/t/innodb_flush_log_at_trx_commit_basic.test rename to mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test diff --git a/mysql-test/t/innodb_flush_method_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test similarity index 100% rename from mysql-test/t/innodb_flush_method_basic.test rename to mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test diff --git a/mysql-test/t/innodb_force_recovery_basic.test b/mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test similarity index 100% rename from mysql-test/t/innodb_force_recovery_basic.test rename to mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test diff --git a/mysql-test/t/innodb_lock_wait_timeout_basic.test b/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test similarity index 100% rename from mysql-test/t/innodb_lock_wait_timeout_basic.test rename to mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test diff --git a/mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test b/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test similarity index 100% rename from mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test rename to mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test diff --git a/mysql-test/t/innodb_log_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test similarity index 100% rename from mysql-test/t/innodb_log_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test diff --git a/mysql-test/t/innodb_log_file_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test similarity index 100% rename from mysql-test/t/innodb_log_file_size_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test diff --git a/mysql-test/t/innodb_log_files_in_group_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test similarity index 100% rename from mysql-test/t/innodb_log_files_in_group_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test diff --git a/mysql-test/t/innodb_log_group_home_dir_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test similarity index 100% rename from mysql-test/t/innodb_log_group_home_dir_basic.test rename to mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test similarity index 100% rename from mysql-test/t/innodb_max_dirty_pages_pct_basic.test rename to mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test diff --git a/mysql-test/t/innodb_max_dirty_pages_pct_func.test b/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test similarity index 100% rename from mysql-test/t/innodb_max_dirty_pages_pct_func.test rename to mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test diff --git a/mysql-test/t/innodb_mirrored_log_groups_basic.test b/mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test similarity index 100% rename from mysql-test/t/innodb_mirrored_log_groups_basic.test rename to mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test diff --git a/mysql-test/t/innodb_open_files_basic.test b/mysql-test/suite/sys_vars/t/innodb_open_files_basic.test similarity index 100% rename from mysql-test/t/innodb_open_files_basic.test rename to mysql-test/suite/sys_vars/t/innodb_open_files_basic.test diff --git a/mysql-test/t/innodb_rollback_on_timeout_basic.test b/mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test similarity index 100% rename from mysql-test/t/innodb_rollback_on_timeout_basic.test rename to mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test diff --git a/mysql-test/t/innodb_support_xa_basic.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test similarity index 100% rename from mysql-test/t/innodb_support_xa_basic.test rename to mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test diff --git a/mysql-test/t/innodb_support_xa_func.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test similarity index 100% rename from mysql-test/t/innodb_support_xa_func.test rename to mysql-test/suite/sys_vars/t/innodb_support_xa_func.test diff --git a/mysql-test/t/innodb_table_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test similarity index 100% rename from mysql-test/t/innodb_table_locks_basic.test rename to mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test diff --git a/mysql-test/t/innodb_table_locks_func.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test similarity index 100% rename from mysql-test/t/innodb_table_locks_func.test rename to mysql-test/suite/sys_vars/t/innodb_table_locks_func.test diff --git a/mysql-test/t/innodb_thread_concurrency_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test similarity index 100% rename from mysql-test/t/innodb_thread_concurrency_basic.test rename to mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test diff --git a/mysql-test/t/insert_id_basic.test b/mysql-test/suite/sys_vars/t/insert_id_basic.test similarity index 100% rename from mysql-test/t/insert_id_basic.test rename to mysql-test/suite/sys_vars/t/insert_id_basic.test diff --git a/mysql-test/t/insert_id_func.test b/mysql-test/suite/sys_vars/t/insert_id_func.test similarity index 100% rename from mysql-test/t/insert_id_func.test rename to mysql-test/suite/sys_vars/t/insert_id_func.test diff --git a/mysql-test/t/interactive_timeout_basic.test b/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test similarity index 100% rename from mysql-test/t/interactive_timeout_basic.test rename to mysql-test/suite/sys_vars/t/interactive_timeout_basic.test diff --git a/mysql-test/t/interactive_timeout_func.test b/mysql-test/suite/sys_vars/t/interactive_timeout_func.test similarity index 100% rename from mysql-test/t/interactive_timeout_func.test rename to mysql-test/suite/sys_vars/t/interactive_timeout_func.test diff --git a/mysql-test/t/keep_files_on_create_basic.test b/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test similarity index 100% rename from mysql-test/t/keep_files_on_create_basic.test rename to mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test diff --git a/mysql-test/t/key_buffer_size_func.test b/mysql-test/suite/sys_vars/t/key_buffer_size_func.test similarity index 100% rename from mysql-test/t/key_buffer_size_func.test rename to mysql-test/suite/sys_vars/t/key_buffer_size_func.test diff --git a/mysql-test/t/last_insert_id_func-master.opt b/mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt similarity index 100% rename from mysql-test/t/last_insert_id_func-master.opt rename to mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt diff --git a/mysql-test/t/last_insert_id_func.test b/mysql-test/suite/sys_vars/t/last_insert_id_func.test similarity index 100% rename from mysql-test/t/last_insert_id_func.test rename to mysql-test/suite/sys_vars/t/last_insert_id_func.test diff --git a/mysql-test/t/lc_time_names_basic.test b/mysql-test/suite/sys_vars/t/lc_time_names_basic.test similarity index 100% rename from mysql-test/t/lc_time_names_basic.test rename to mysql-test/suite/sys_vars/t/lc_time_names_basic.test diff --git a/mysql-test/t/lc_time_names_func.test b/mysql-test/suite/sys_vars/t/lc_time_names_func.test similarity index 100% rename from mysql-test/t/lc_time_names_func.test rename to mysql-test/suite/sys_vars/t/lc_time_names_func.test diff --git a/mysql-test/t/license_basic.test b/mysql-test/suite/sys_vars/t/license_basic.test similarity index 100% rename from mysql-test/t/license_basic.test rename to mysql-test/suite/sys_vars/t/license_basic.test diff --git a/mysql-test/t/local_infile_basic.test b/mysql-test/suite/sys_vars/t/local_infile_basic.test similarity index 100% rename from mysql-test/t/local_infile_basic.test rename to mysql-test/suite/sys_vars/t/local_infile_basic.test diff --git a/mysql-test/t/local_infile_func.test b/mysql-test/suite/sys_vars/t/local_infile_func.test similarity index 100% rename from mysql-test/t/local_infile_func.test rename to mysql-test/suite/sys_vars/t/local_infile_func.test diff --git a/mysql-test/t/log_basic.test b/mysql-test/suite/sys_vars/t/log_basic.test similarity index 100% rename from mysql-test/t/log_basic.test rename to mysql-test/suite/sys_vars/t/log_basic.test diff --git a/mysql-test/t/log_bin_trust_function_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test similarity index 100% rename from mysql-test/t/log_bin_trust_function_creators_basic.test rename to mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test diff --git a/mysql-test/t/log_bin_trust_function_creators_func-master.opt b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func-master.opt similarity index 100% rename from mysql-test/t/log_bin_trust_function_creators_func-master.opt rename to mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func-master.opt diff --git a/mysql-test/t/log_bin_trust_function_creators_func.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test similarity index 100% rename from mysql-test/t/log_bin_trust_function_creators_func.test rename to mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test diff --git a/mysql-test/t/log_bin_trust_routine_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test similarity index 100% rename from mysql-test/t/log_bin_trust_routine_creators_basic.test rename to mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test diff --git a/mysql-test/t/log_output_basic.test b/mysql-test/suite/sys_vars/t/log_output_basic.test similarity index 100% rename from mysql-test/t/log_output_basic.test rename to mysql-test/suite/sys_vars/t/log_output_basic.test diff --git a/mysql-test/t/log_output_func.test b/mysql-test/suite/sys_vars/t/log_output_func.test similarity index 100% rename from mysql-test/t/log_output_func.test rename to mysql-test/suite/sys_vars/t/log_output_func.test diff --git a/mysql-test/t/log_queries_not_using_indexes_basic.test b/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test similarity index 100% rename from mysql-test/t/log_queries_not_using_indexes_basic.test rename to mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test diff --git a/mysql-test/t/long_query_time_basic.test b/mysql-test/suite/sys_vars/t/long_query_time_basic.test similarity index 100% rename from mysql-test/t/long_query_time_basic.test rename to mysql-test/suite/sys_vars/t/long_query_time_basic.test diff --git a/mysql-test/t/low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test similarity index 100% rename from mysql-test/t/low_priority_updates_basic.test rename to mysql-test/suite/sys_vars/t/low_priority_updates_basic.test diff --git a/mysql-test/t/max_allowed_packet_basic.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test similarity index 100% rename from mysql-test/t/max_allowed_packet_basic.test rename to mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test diff --git a/mysql-test/t/max_allowed_packet_func.test b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test similarity index 100% rename from mysql-test/t/max_allowed_packet_func.test rename to mysql-test/suite/sys_vars/t/max_allowed_packet_func.test diff --git a/mysql-test/t/max_binlog_cache_size_func-master.opt b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt similarity index 100% rename from mysql-test/t/max_binlog_cache_size_func-master.opt rename to mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt diff --git a/mysql-test/t/max_binlog_size_basic.test b/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test similarity index 100% rename from mysql-test/t/max_binlog_size_basic.test rename to mysql-test/suite/sys_vars/t/max_binlog_size_basic.test diff --git a/mysql-test/t/max_connections_basic.test b/mysql-test/suite/sys_vars/t/max_connections_basic.test similarity index 100% rename from mysql-test/t/max_connections_basic.test rename to mysql-test/suite/sys_vars/t/max_connections_basic.test diff --git a/mysql-test/t/max_delayed_threads_basic.test b/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test similarity index 100% rename from mysql-test/t/max_delayed_threads_basic.test rename to mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test diff --git a/mysql-test/t/max_error_count_basic.test b/mysql-test/suite/sys_vars/t/max_error_count_basic.test similarity index 100% rename from mysql-test/t/max_error_count_basic.test rename to mysql-test/suite/sys_vars/t/max_error_count_basic.test diff --git a/mysql-test/t/max_insert_delayed_threads_basic.test b/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test similarity index 100% rename from mysql-test/t/max_insert_delayed_threads_basic.test rename to mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test diff --git a/mysql-test/t/max_join_size_func.test b/mysql-test/suite/sys_vars/t/max_join_size_func.test similarity index 100% rename from mysql-test/t/max_join_size_func.test rename to mysql-test/suite/sys_vars/t/max_join_size_func.test diff --git a/mysql-test/t/max_length_for_sort_data_basic.test b/mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test similarity index 100% rename from mysql-test/t/max_length_for_sort_data_basic.test rename to mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test diff --git a/mysql-test/t/max_prepared_stmt_count_basic.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test similarity index 100% rename from mysql-test/t/max_prepared_stmt_count_basic.test rename to mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test diff --git a/mysql-test/t/max_prepared_stmt_count_func.test b/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test similarity index 100% rename from mysql-test/t/max_prepared_stmt_count_func.test rename to mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test diff --git a/mysql-test/t/max_relay_log_size_basic.test b/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test similarity index 100% rename from mysql-test/t/max_relay_log_size_basic.test rename to mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test diff --git a/mysql-test/t/max_seeks_for_key_func.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test similarity index 100% rename from mysql-test/t/max_seeks_for_key_func.test rename to mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test diff --git a/mysql-test/t/max_sort_length_basic.test b/mysql-test/suite/sys_vars/t/max_sort_length_basic.test similarity index 100% rename from mysql-test/t/max_sort_length_basic.test rename to mysql-test/suite/sys_vars/t/max_sort_length_basic.test diff --git a/mysql-test/t/max_sort_length_func.test b/mysql-test/suite/sys_vars/t/max_sort_length_func.test similarity index 100% rename from mysql-test/t/max_sort_length_func.test rename to mysql-test/suite/sys_vars/t/max_sort_length_func.test diff --git a/mysql-test/t/max_sp_recursion_depth_basic.test b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test similarity index 100% rename from mysql-test/t/max_sp_recursion_depth_basic.test rename to mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test diff --git a/mysql-test/t/max_sp_recursion_depth_func.test b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test similarity index 100% rename from mysql-test/t/max_sp_recursion_depth_func.test rename to mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test diff --git a/mysql-test/t/max_user_connections_basic.test b/mysql-test/suite/sys_vars/t/max_user_connections_basic.test similarity index 100% rename from mysql-test/t/max_user_connections_basic.test rename to mysql-test/suite/sys_vars/t/max_user_connections_basic.test diff --git a/mysql-test/t/max_user_connections_func.test b/mysql-test/suite/sys_vars/t/max_user_connections_func.test similarity index 100% rename from mysql-test/t/max_user_connections_func.test rename to mysql-test/suite/sys_vars/t/max_user_connections_func.test diff --git a/mysql-test/t/myisam_data_pointer_size_basic.test b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test similarity index 100% rename from mysql-test/t/myisam_data_pointer_size_basic.test rename to mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test diff --git a/mysql-test/t/myisam_data_pointer_size_func.test b/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test similarity index 100% rename from mysql-test/t/myisam_data_pointer_size_func.test rename to mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test diff --git a/mysql-test/t/myisam_stats_method_basic.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test similarity index 100% rename from mysql-test/t/myisam_stats_method_basic.test rename to mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test diff --git a/mysql-test/t/myisam_stats_method_func.test b/mysql-test/suite/sys_vars/t/myisam_stats_method_func.test similarity index 100% rename from mysql-test/t/myisam_stats_method_func.test rename to mysql-test/suite/sys_vars/t/myisam_stats_method_func.test diff --git a/mysql-test/t/myisam_use_mmap_basic.test b/mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test similarity index 100% rename from mysql-test/t/myisam_use_mmap_basic.test rename to mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test diff --git a/mysql-test/t/ndb_log_update_as_write_basic.test b/mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test similarity index 100% rename from mysql-test/t/ndb_log_update_as_write_basic.test rename to mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test diff --git a/mysql-test/t/ndb_log_updated_only_basic.test b/mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test similarity index 100% rename from mysql-test/t/ndb_log_updated_only_basic.test rename to mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test diff --git a/mysql-test/t/net_buffer_length_basic.test b/mysql-test/suite/sys_vars/t/net_buffer_length_basic.test similarity index 100% rename from mysql-test/t/net_buffer_length_basic.test rename to mysql-test/suite/sys_vars/t/net_buffer_length_basic.test diff --git a/mysql-test/t/net_read_timeout_basic.test b/mysql-test/suite/sys_vars/t/net_read_timeout_basic.test similarity index 100% rename from mysql-test/t/net_read_timeout_basic.test rename to mysql-test/suite/sys_vars/t/net_read_timeout_basic.test diff --git a/mysql-test/t/net_write_timeout_basic.test b/mysql-test/suite/sys_vars/t/net_write_timeout_basic.test similarity index 100% rename from mysql-test/t/net_write_timeout_basic.test rename to mysql-test/suite/sys_vars/t/net_write_timeout_basic.test diff --git a/mysql-test/t/new_basic.test b/mysql-test/suite/sys_vars/t/new_basic.test similarity index 100% rename from mysql-test/t/new_basic.test rename to mysql-test/suite/sys_vars/t/new_basic.test diff --git a/mysql-test/t/old_passwords_basic.test b/mysql-test/suite/sys_vars/t/old_passwords_basic.test similarity index 100% rename from mysql-test/t/old_passwords_basic.test rename to mysql-test/suite/sys_vars/t/old_passwords_basic.test diff --git a/mysql-test/t/old_passwords_func.test b/mysql-test/suite/sys_vars/t/old_passwords_func.test similarity index 100% rename from mysql-test/t/old_passwords_func.test rename to mysql-test/suite/sys_vars/t/old_passwords_func.test diff --git a/mysql-test/t/optimizer_prune_level_basic.test b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test similarity index 100% rename from mysql-test/t/optimizer_prune_level_basic.test rename to mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test diff --git a/mysql-test/t/optimizer_search_depth_basic.test b/mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test similarity index 100% rename from mysql-test/t/optimizer_search_depth_basic.test rename to mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test diff --git a/mysql-test/t/preload_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test similarity index 100% rename from mysql-test/t/preload_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test diff --git a/mysql-test/t/query_cache_limit_func.test b/mysql-test/suite/sys_vars/t/query_cache_limit_func.test similarity index 100% rename from mysql-test/t/query_cache_limit_func.test rename to mysql-test/suite/sys_vars/t/query_cache_limit_func.test diff --git a/mysql-test/t/query_cache_type_basic.test b/mysql-test/suite/sys_vars/t/query_cache_type_basic.test similarity index 100% rename from mysql-test/t/query_cache_type_basic.test rename to mysql-test/suite/sys_vars/t/query_cache_type_basic.test diff --git a/mysql-test/t/query_cache_type_func.test b/mysql-test/suite/sys_vars/t/query_cache_type_func.test similarity index 100% rename from mysql-test/t/query_cache_type_func.test rename to mysql-test/suite/sys_vars/t/query_cache_type_func.test diff --git a/mysql-test/t/query_cache_wlock_invalidate_basic.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test similarity index 100% rename from mysql-test/t/query_cache_wlock_invalidate_basic.test rename to mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test diff --git a/mysql-test/t/query_cache_wlock_invalidate_func.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test similarity index 100% rename from mysql-test/t/query_cache_wlock_invalidate_func.test rename to mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test diff --git a/mysql-test/t/query_prealloc_size_func.test b/mysql-test/suite/sys_vars/t/query_prealloc_size_func.test similarity index 100% rename from mysql-test/t/query_prealloc_size_func.test rename to mysql-test/suite/sys_vars/t/query_prealloc_size_func.test diff --git a/mysql-test/t/read_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/read_buffer_size_basic.test similarity index 100% rename from mysql-test/t/read_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/read_buffer_size_basic.test diff --git a/mysql-test/t/read_only_basic.test b/mysql-test/suite/sys_vars/t/read_only_basic.test similarity index 100% rename from mysql-test/t/read_only_basic.test rename to mysql-test/suite/sys_vars/t/read_only_basic.test diff --git a/mysql-test/t/read_only_func.test b/mysql-test/suite/sys_vars/t/read_only_func.test similarity index 100% rename from mysql-test/t/read_only_func.test rename to mysql-test/suite/sys_vars/t/read_only_func.test diff --git a/mysql-test/t/read_rnd_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test similarity index 100% rename from mysql-test/t/read_rnd_buffer_size_basic.test rename to mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test diff --git a/mysql-test/t/relay_log_purge_basic.test b/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test similarity index 100% rename from mysql-test/t/relay_log_purge_basic.test rename to mysql-test/suite/sys_vars/t/relay_log_purge_basic.test diff --git a/mysql-test/t/rpl_init_slave_func-slave.opt b/mysql-test/suite/sys_vars/t/rpl_init_slave_func-slave.opt similarity index 100% rename from mysql-test/t/rpl_init_slave_func-slave.opt rename to mysql-test/suite/sys_vars/t/rpl_init_slave_func-slave.opt diff --git a/mysql-test/t/rpl_init_slave_func.test b/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test similarity index 100% rename from mysql-test/t/rpl_init_slave_func.test rename to mysql-test/suite/sys_vars/t/rpl_init_slave_func.test diff --git a/mysql-test/t/rpl_max_binlog_size_func-master.opt b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt similarity index 100% rename from mysql-test/t/rpl_max_binlog_size_func-master.opt rename to mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt diff --git a/mysql-test/t/rpl_max_binlog_size_func.test b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test similarity index 98% rename from mysql-test/t/rpl_max_binlog_size_func.test rename to mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test index df22b253009..d9b8d936506 100644 --- a/mysql-test/t/rpl_max_binlog_size_func.test +++ b/mysql-test/suite/sys_vars/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 # ############################################################################### diff --git a/mysql-test/t/secure_auth_basic.test b/mysql-test/suite/sys_vars/t/secure_auth_basic.test similarity index 100% rename from mysql-test/t/secure_auth_basic.test rename to mysql-test/suite/sys_vars/t/secure_auth_basic.test diff --git a/mysql-test/t/secure_auth_func-master.opt b/mysql-test/suite/sys_vars/t/secure_auth_func-master.opt similarity index 100% rename from mysql-test/t/secure_auth_func-master.opt rename to mysql-test/suite/sys_vars/t/secure_auth_func-master.opt diff --git a/mysql-test/t/secure_auth_func.test b/mysql-test/suite/sys_vars/t/secure_auth_func.test similarity index 100% rename from mysql-test/t/secure_auth_func.test rename to mysql-test/suite/sys_vars/t/secure_auth_func.test diff --git a/mysql-test/t/slave_allow_batching_basic.test b/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test similarity index 100% rename from mysql-test/t/slave_allow_batching_basic.test rename to mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test diff --git a/mysql-test/t/slave_compressed_protocol_basic.test b/mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test similarity index 100% rename from mysql-test/t/slave_compressed_protocol_basic.test rename to mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test diff --git a/mysql-test/t/slave_exec_mode_basic.test b/mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test similarity index 100% rename from mysql-test/t/slave_exec_mode_basic.test rename to mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test diff --git a/mysql-test/t/slave_net_timeout_basic.test b/mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test similarity index 100% rename from mysql-test/t/slave_net_timeout_basic.test rename to mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test diff --git a/mysql-test/t/slow_launch_time_basic.test b/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test similarity index 100% rename from mysql-test/t/slow_launch_time_basic.test rename to mysql-test/suite/sys_vars/t/slow_launch_time_basic.test diff --git a/mysql-test/t/slow_launch_time_func.test b/mysql-test/suite/sys_vars/t/slow_launch_time_func.test similarity index 100% rename from mysql-test/t/slow_launch_time_func.test rename to mysql-test/suite/sys_vars/t/slow_launch_time_func.test diff --git a/mysql-test/t/slow_query_log_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_basic.test similarity index 100% rename from mysql-test/t/slow_query_log_basic.test rename to mysql-test/suite/sys_vars/t/slow_query_log_basic.test diff --git a/mysql-test/t/slow_query_log_file_basic-master.opt b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt similarity index 100% rename from mysql-test/t/slow_query_log_file_basic-master.opt rename to mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt diff --git a/mysql-test/t/slow_query_log_file_basic.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test similarity index 100% rename from mysql-test/t/slow_query_log_file_basic.test rename to mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test diff --git a/mysql-test/t/slow_query_log_file_func-master.opt b/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt similarity index 100% rename from mysql-test/t/slow_query_log_file_func-master.opt rename to mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt diff --git a/mysql-test/t/slow_query_log_file_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_file_func.test similarity index 100% rename from mysql-test/t/slow_query_log_file_func.test rename to mysql-test/suite/sys_vars/t/slow_query_log_file_func.test diff --git a/mysql-test/t/slow_query_log_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_func.test similarity index 100% rename from mysql-test/t/slow_query_log_func.test rename to mysql-test/suite/sys_vars/t/slow_query_log_func.test diff --git a/mysql-test/t/sql_auto_is_null_basic.test b/mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test similarity index 100% rename from mysql-test/t/sql_auto_is_null_basic.test rename to mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test diff --git a/mysql-test/t/sql_big_selects_basic.test b/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test similarity index 100% rename from mysql-test/t/sql_big_selects_basic.test rename to mysql-test/suite/sys_vars/t/sql_big_selects_basic.test diff --git a/mysql-test/t/sql_big_selects_func.test b/mysql-test/suite/sys_vars/t/sql_big_selects_func.test similarity index 100% rename from mysql-test/t/sql_big_selects_func.test rename to mysql-test/suite/sys_vars/t/sql_big_selects_func.test diff --git a/mysql-test/t/sql_big_tables_basic.test b/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test similarity index 100% rename from mysql-test/t/sql_big_tables_basic.test rename to mysql-test/suite/sys_vars/t/sql_big_tables_basic.test diff --git a/mysql-test/t/sql_big_tables_func.test b/mysql-test/suite/sys_vars/t/sql_big_tables_func.test similarity index 100% rename from mysql-test/t/sql_big_tables_func.test rename to mysql-test/suite/sys_vars/t/sql_big_tables_func.test diff --git a/mysql-test/t/sql_buffer_result_basic.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test similarity index 100% rename from mysql-test/t/sql_buffer_result_basic.test rename to mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test diff --git a/mysql-test/t/sql_buffer_result_func.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_func.test similarity index 100% rename from mysql-test/t/sql_buffer_result_func.test rename to mysql-test/suite/sys_vars/t/sql_buffer_result_func.test diff --git a/mysql-test/t/sql_log_bin_basic.test b/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test similarity index 100% rename from mysql-test/t/sql_log_bin_basic.test rename to mysql-test/suite/sys_vars/t/sql_log_bin_basic.test diff --git a/mysql-test/t/sql_log_off_basic.test b/mysql-test/suite/sys_vars/t/sql_log_off_basic.test similarity index 100% rename from mysql-test/t/sql_log_off_basic.test rename to mysql-test/suite/sys_vars/t/sql_log_off_basic.test diff --git a/mysql-test/t/sql_log_off_func.test b/mysql-test/suite/sys_vars/t/sql_log_off_func.test similarity index 100% rename from mysql-test/t/sql_log_off_func.test rename to mysql-test/suite/sys_vars/t/sql_log_off_func.test diff --git a/mysql-test/t/sql_low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test similarity index 100% rename from mysql-test/t/sql_low_priority_updates_basic.test rename to mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test diff --git a/mysql-test/t/sql_low_priority_updates_func.test b/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test similarity index 100% rename from mysql-test/t/sql_low_priority_updates_func.test rename to mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test diff --git a/mysql-test/t/sql_max_join_size_func.test b/mysql-test/suite/sys_vars/t/sql_max_join_size_func.test similarity index 100% rename from mysql-test/t/sql_max_join_size_func.test rename to mysql-test/suite/sys_vars/t/sql_max_join_size_func.test diff --git a/mysql-test/t/sql_mode_basic.test b/mysql-test/suite/sys_vars/t/sql_mode_basic.test similarity index 100% rename from mysql-test/t/sql_mode_basic.test rename to mysql-test/suite/sys_vars/t/sql_mode_basic.test diff --git a/mysql-test/t/sql_mode_func.test b/mysql-test/suite/sys_vars/t/sql_mode_func.test similarity index 100% rename from mysql-test/t/sql_mode_func.test rename to mysql-test/suite/sys_vars/t/sql_mode_func.test diff --git a/mysql-test/t/sql_notes_basic.test b/mysql-test/suite/sys_vars/t/sql_notes_basic.test similarity index 100% rename from mysql-test/t/sql_notes_basic.test rename to mysql-test/suite/sys_vars/t/sql_notes_basic.test diff --git a/mysql-test/t/sql_notes_func.test b/mysql-test/suite/sys_vars/t/sql_notes_func.test similarity index 100% rename from mysql-test/t/sql_notes_func.test rename to mysql-test/suite/sys_vars/t/sql_notes_func.test diff --git a/mysql-test/t/sql_quote_show_create_basic.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test similarity index 100% rename from mysql-test/t/sql_quote_show_create_basic.test rename to mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test diff --git a/mysql-test/t/sql_quote_show_create_func.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test similarity index 100% rename from mysql-test/t/sql_quote_show_create_func.test rename to mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test diff --git a/mysql-test/t/sql_safe_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test similarity index 100% rename from mysql-test/t/sql_safe_updates_basic.test rename to mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test diff --git a/mysql-test/t/sql_safe_updates_func.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_func.test similarity index 100% rename from mysql-test/t/sql_safe_updates_func.test rename to mysql-test/suite/sys_vars/t/sql_safe_updates_func.test diff --git a/mysql-test/t/sql_select_limit_func.test b/mysql-test/suite/sys_vars/t/sql_select_limit_func.test similarity index 100% rename from mysql-test/t/sql_select_limit_func.test rename to mysql-test/suite/sys_vars/t/sql_select_limit_func.test diff --git a/mysql-test/t/sql_slave_skip_counter_basic.test b/mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test similarity index 100% rename from mysql-test/t/sql_slave_skip_counter_basic.test rename to mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test diff --git a/mysql-test/t/sql_warnings_basic.test b/mysql-test/suite/sys_vars/t/sql_warnings_basic.test similarity index 100% rename from mysql-test/t/sql_warnings_basic.test rename to mysql-test/suite/sys_vars/t/sql_warnings_basic.test diff --git a/mysql-test/t/sql_warnings_func.test b/mysql-test/suite/sys_vars/t/sql_warnings_func.test similarity index 100% rename from mysql-test/t/sql_warnings_func.test rename to mysql-test/suite/sys_vars/t/sql_warnings_func.test diff --git a/mysql-test/t/ssl_ca_basic.test b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test similarity index 100% rename from mysql-test/t/ssl_ca_basic.test rename to mysql-test/suite/sys_vars/t/ssl_ca_basic.test diff --git a/mysql-test/t/ssl_capath_basic.test b/mysql-test/suite/sys_vars/t/ssl_capath_basic.test similarity index 100% rename from mysql-test/t/ssl_capath_basic.test rename to mysql-test/suite/sys_vars/t/ssl_capath_basic.test diff --git a/mysql-test/t/ssl_cert_basic.test b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test similarity index 100% rename from mysql-test/t/ssl_cert_basic.test rename to mysql-test/suite/sys_vars/t/ssl_cert_basic.test diff --git a/mysql-test/t/ssl_cipher_basic.test b/mysql-test/suite/sys_vars/t/ssl_cipher_basic.test similarity index 100% rename from mysql-test/t/ssl_cipher_basic.test rename to mysql-test/suite/sys_vars/t/ssl_cipher_basic.test diff --git a/mysql-test/t/ssl_key_basic.test b/mysql-test/suite/sys_vars/t/ssl_key_basic.test similarity index 100% rename from mysql-test/t/ssl_key_basic.test rename to mysql-test/suite/sys_vars/t/ssl_key_basic.test diff --git a/mysql-test/t/storage_engine_basic-master.opt b/mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt similarity index 100% rename from mysql-test/t/storage_engine_basic-master.opt rename to mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt diff --git a/mysql-test/t/storage_engine_basic.test b/mysql-test/suite/sys_vars/t/storage_engine_basic.test similarity index 100% rename from mysql-test/t/storage_engine_basic.test rename to mysql-test/suite/sys_vars/t/storage_engine_basic.test diff --git a/mysql-test/t/sync_frm_basic.test b/mysql-test/suite/sys_vars/t/sync_frm_basic.test similarity index 100% rename from mysql-test/t/sync_frm_basic.test rename to mysql-test/suite/sys_vars/t/sync_frm_basic.test diff --git a/mysql-test/t/system_time_zone_basic.test b/mysql-test/suite/sys_vars/t/system_time_zone_basic.test similarity index 100% rename from mysql-test/t/system_time_zone_basic.test rename to mysql-test/suite/sys_vars/t/system_time_zone_basic.test diff --git a/mysql-test/t/table_definition_cache_basic.test b/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test similarity index 100% rename from mysql-test/t/table_definition_cache_basic.test rename to mysql-test/suite/sys_vars/t/table_definition_cache_basic.test diff --git a/mysql-test/t/table_lock_wait_timeout_basic.test b/mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test similarity index 100% rename from mysql-test/t/table_lock_wait_timeout_basic.test rename to mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test diff --git a/mysql-test/t/table_open_cache_basic.test b/mysql-test/suite/sys_vars/t/table_open_cache_basic.test similarity index 100% rename from mysql-test/t/table_open_cache_basic.test rename to mysql-test/suite/sys_vars/t/table_open_cache_basic.test diff --git a/mysql-test/t/thread_cache_size_func.test b/mysql-test/suite/sys_vars/t/thread_cache_size_func.test similarity index 100% rename from mysql-test/t/thread_cache_size_func.test rename to mysql-test/suite/sys_vars/t/thread_cache_size_func.test diff --git a/mysql-test/t/thread_handling_basic.test b/mysql-test/suite/sys_vars/t/thread_handling_basic.test similarity index 100% rename from mysql-test/t/thread_handling_basic.test rename to mysql-test/suite/sys_vars/t/thread_handling_basic.test diff --git a/mysql-test/t/time_zone_basic.test b/mysql-test/suite/sys_vars/t/time_zone_basic.test similarity index 100% rename from mysql-test/t/time_zone_basic.test rename to mysql-test/suite/sys_vars/t/time_zone_basic.test diff --git a/mysql-test/t/time_zone_func.test b/mysql-test/suite/sys_vars/t/time_zone_func.test similarity index 100% rename from mysql-test/t/time_zone_func.test rename to mysql-test/suite/sys_vars/t/time_zone_func.test diff --git a/mysql-test/t/timed_mutexes_basic.test b/mysql-test/suite/sys_vars/t/timed_mutexes_basic.test similarity index 100% rename from mysql-test/t/timed_mutexes_basic.test rename to mysql-test/suite/sys_vars/t/timed_mutexes_basic.test diff --git a/mysql-test/t/timestamp_func.test b/mysql-test/suite/sys_vars/t/timestamp_func.test similarity index 100% rename from mysql-test/t/timestamp_func.test rename to mysql-test/suite/sys_vars/t/timestamp_func.test diff --git a/mysql-test/t/timestamp_sysdate_is_now_func-master.opt b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt similarity index 100% rename from mysql-test/t/timestamp_sysdate_is_now_func-master.opt rename to mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt diff --git a/mysql-test/t/timestamp_sysdate_is_now_func.test b/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test similarity index 100% rename from mysql-test/t/timestamp_sysdate_is_now_func.test rename to mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test diff --git a/mysql-test/t/tmpdir_basic.test b/mysql-test/suite/sys_vars/t/tmpdir_basic.test similarity index 100% rename from mysql-test/t/tmpdir_basic.test rename to mysql-test/suite/sys_vars/t/tmpdir_basic.test diff --git a/mysql-test/t/tx_isolation_basic.test b/mysql-test/suite/sys_vars/t/tx_isolation_basic.test similarity index 100% rename from mysql-test/t/tx_isolation_basic.test rename to mysql-test/suite/sys_vars/t/tx_isolation_basic.test diff --git a/mysql-test/t/tx_isolation_func-master.opt b/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt similarity index 100% rename from mysql-test/t/tx_isolation_func-master.opt rename to mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt diff --git a/mysql-test/t/tx_isolation_func.test b/mysql-test/suite/sys_vars/t/tx_isolation_func.test similarity index 100% rename from mysql-test/t/tx_isolation_func.test rename to mysql-test/suite/sys_vars/t/tx_isolation_func.test diff --git a/mysql-test/t/unique_checks_basic.test b/mysql-test/suite/sys_vars/t/unique_checks_basic.test similarity index 100% rename from mysql-test/t/unique_checks_basic.test rename to mysql-test/suite/sys_vars/t/unique_checks_basic.test diff --git a/mysql-test/t/updatable_views_with_limit_basic.test b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test similarity index 100% rename from mysql-test/t/updatable_views_with_limit_basic.test rename to mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test diff --git a/mysql-test/t/updatable_views_with_limit_func.test b/mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test similarity index 100% rename from mysql-test/t/updatable_views_with_limit_func.test rename to mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test diff --git a/mysql-test/t/version_basic.test b/mysql-test/suite/sys_vars/t/version_basic.test similarity index 100% rename from mysql-test/t/version_basic.test rename to mysql-test/suite/sys_vars/t/version_basic.test diff --git a/mysql-test/t/version_comment_basic.test b/mysql-test/suite/sys_vars/t/version_comment_basic.test similarity index 100% rename from mysql-test/t/version_comment_basic.test rename to mysql-test/suite/sys_vars/t/version_comment_basic.test diff --git a/mysql-test/t/version_compile_machine_basic.test b/mysql-test/suite/sys_vars/t/version_compile_machine_basic.test similarity index 100% rename from mysql-test/t/version_compile_machine_basic.test rename to mysql-test/suite/sys_vars/t/version_compile_machine_basic.test diff --git a/mysql-test/t/version_compile_os_basic.test b/mysql-test/suite/sys_vars/t/version_compile_os_basic.test similarity index 100% rename from mysql-test/t/version_compile_os_basic.test rename to mysql-test/suite/sys_vars/t/version_compile_os_basic.test diff --git a/mysql-test/t/wait_timeout_func.test b/mysql-test/suite/sys_vars/t/wait_timeout_func.test similarity index 100% rename from mysql-test/t/wait_timeout_func.test rename to mysql-test/suite/sys_vars/t/wait_timeout_func.test diff --git a/mysql-test/t/warning_count_basic.test b/mysql-test/suite/sys_vars/t/warning_count_basic.test similarity index 100% rename from mysql-test/t/warning_count_basic.test rename to mysql-test/suite/sys_vars/t/warning_count_basic.test