#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team-to-merge/ based on revid:kevin.lewis@stripped
2973 Hakan Kuecuekyilmaz 2009-01-23 [merge]
Merged:
mysql-6.0 --> mysql-6.0-falcon --> mysql-6.0-falcon-team.
removed:
mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
renamed:
mysql-test/include/charset_basic.inc => mysql-test/suite/sys_vars/inc/charset_basic.inc
mysql-test/include/collation_basic.inc => mysql-test/suite/sys_vars/inc/collation_basic.inc
mysql-test/r/auto_commit_basic.result => mysql-test/suite/sys_vars/r/auto_commit_basic.result
mysql-test/r/auto_increment_increment_basic.result => mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
mysql-test/r/auto_increment_increment_func.result => mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
mysql-test/r/auto_increment_offset_basic.result => mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
mysql-test/r/auto_increment_offset_func.result => mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
mysql-test/r/autocommit_func.result => mysql-test/suite/sys_vars/r/autocommit_func.result
mysql-test/r/automatic_sp_privileges_basic.result => mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
mysql-test/r/automatic_sp_privileges_func.result => mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result
mysql-test/r/basedir_basic.result => mysql-test/suite/sys_vars/r/basedir_basic.result
mysql-test/r/big_tables_basic.result => mysql-test/suite/sys_vars/r/big_tables_basic.result
mysql-test/r/binlog_format_basic.result => mysql-test/suite/sys_vars/r/binlog_format_basic.result
mysql-test/r/character_set_client_basic.result => mysql-test/suite/sys_vars/r/character_set_client_basic.result
mysql-test/r/character_set_client_func.result => mysql-test/suite/sys_vars/r/character_set_client_func.result
mysql-test/r/character_set_connection_basic.result => mysql-test/suite/sys_vars/r/character_set_connection_basic.result
mysql-test/r/character_set_connection_func.result => mysql-test/suite/sys_vars/r/character_set_connection_func.result
mysql-test/r/character_set_database_basic.result => mysql-test/suite/sys_vars/r/character_set_database_basic.result
mysql-test/r/character_set_database_func.result => mysql-test/suite/sys_vars/r/character_set_database_func.result
mysql-test/r/character_set_filesystem_basic.result => mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
mysql-test/r/character_set_results_basic.result => mysql-test/suite/sys_vars/r/character_set_results_basic.result
mysql-test/r/character_set_results_func.result => mysql-test/suite/sys_vars/r/character_set_results_func.result
mysql-test/r/character_set_server_basic.result => mysql-test/suite/sys_vars/r/character_set_server_basic.result
mysql-test/r/character_set_server_func.result => mysql-test/suite/sys_vars/r/character_set_server_func.result
mysql-test/r/character_set_system_basic.result => mysql-test/suite/sys_vars/r/character_set_system_basic.result
mysql-test/r/collation_connection_basic.result => mysql-test/suite/sys_vars/r/collation_connection_basic.result
mysql-test/r/collation_connection_func.result => mysql-test/suite/sys_vars/r/collation_connection_func.result
mysql-test/r/collation_database_basic.result => mysql-test/suite/sys_vars/r/collation_database_basic.result
mysql-test/r/collation_database_func.result => mysql-test/suite/sys_vars/r/collation_database_func.result
mysql-test/r/collation_server_basic.result => mysql-test/suite/sys_vars/r/collation_server_basic.result
mysql-test/r/collation_server_func.result => mysql-test/suite/sys_vars/r/collation_server_func.result
mysql-test/r/completion_type_basic.result => mysql-test/suite/sys_vars/r/completion_type_basic.result
mysql-test/r/completion_type_func.result => mysql-test/suite/sys_vars/r/completion_type_func.result
mysql-test/r/concurrent_insert_basic.result => mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
mysql-test/r/concurrent_insert_func.result => mysql-test/suite/sys_vars/r/concurrent_insert_func.result
mysql-test/r/connect_timeout_basic.result => mysql-test/suite/sys_vars/r/connect_timeout_basic.result
mysql-test/r/datadir_basic.result => mysql-test/suite/sys_vars/r/datadir_basic.result
mysql-test/r/default_week_format_basic.result => mysql-test/suite/sys_vars/r/default_week_format_basic.result
mysql-test/r/default_week_format_func.result => mysql-test/suite/sys_vars/r/default_week_format_func.result
mysql-test/r/delay_key_write_basic.result => mysql-test/suite/sys_vars/r/delay_key_write_basic.result
mysql-test/r/delay_key_write_func.result => mysql-test/suite/sys_vars/r/delay_key_write_func.result
mysql-test/r/delayed_insert_limit_func.result => mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
mysql-test/r/delayed_insert_timeout_basic.result => mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
mysql-test/r/div_precision_increment_basic.result => mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
mysql-test/r/div_precision_increment_func.result => mysql-test/suite/sys_vars/r/div_precision_increment_func.result
mysql-test/r/engine_condition_pushdown_basic.result => mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
mysql-test/r/error_count_basic.result => mysql-test/suite/sys_vars/r/error_count_basic.result
mysql-test/r/event_scheduler_basic.result => mysql-test/suite/sys_vars/r/event_scheduler_basic.result
mysql-test/r/event_scheduler_func.result => mysql-test/suite/sys_vars/r/event_scheduler_func.result
mysql-test/r/expire_logs_days_basic.result => mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
mysql-test/r/flush_basic.result => mysql-test/suite/sys_vars/r/flush_basic.result
mysql-test/r/foreign_key_checks_basic.result => mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
mysql-test/r/foreign_key_checks_func.result => mysql-test/suite/sys_vars/r/foreign_key_checks_func.result
mysql-test/r/ft_boolean_syntax_basic.result => mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result
mysql-test/r/ft_boolean_syntax_func.result => mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result
mysql-test/r/general_log_basic.result => mysql-test/suite/sys_vars/r/general_log_basic.result
mysql-test/r/general_log_file_basic.result => mysql-test/suite/sys_vars/r/general_log_file_basic.result
mysql-test/r/general_log_file_func.result => mysql-test/suite/sys_vars/r/general_log_file_func.result
mysql-test/r/general_log_func.result => mysql-test/suite/sys_vars/r/general_log_func.result
mysql-test/r/group_concat_max_len_basic.result => mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
mysql-test/r/group_concat_max_len_func.result => mysql-test/suite/sys_vars/r/group_concat_max_len_func.result
mysql-test/r/have_compress_basic.result => mysql-test/suite/sys_vars/r/have_compress_basic.result
mysql-test/r/have_crypt_basic.result => mysql-test/suite/sys_vars/r/have_crypt_basic.result
mysql-test/r/have_csv_basic.result => mysql-test/suite/sys_vars/r/have_csv_basic.result
mysql-test/r/have_dynamic_loading_basic.result => mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
mysql-test/r/have_geometry_basic.result => mysql-test/suite/sys_vars/r/have_geometry_basic.result
mysql-test/r/have_innodb_basic.result => mysql-test/suite/sys_vars/r/have_innodb_basic.result
mysql-test/r/have_ndbcluster_basic.result => mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result
mysql-test/r/have_openssl_basic.result => mysql-test/suite/sys_vars/r/have_openssl_basic.result
mysql-test/r/have_partitioning_basic.result => mysql-test/suite/sys_vars/r/have_partitioning_basic.result
mysql-test/r/have_query_cache_basic.result => mysql-test/suite/sys_vars/r/have_query_cache_basic.result
mysql-test/r/have_rtree_keys_basic.result => mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
mysql-test/r/have_ssl_basic.result => mysql-test/suite/sys_vars/r/have_ssl_basic.result
mysql-test/r/have_symlink_basic.result => mysql-test/suite/sys_vars/r/have_symlink_basic.result
mysql-test/r/hostname_basic.result => mysql-test/suite/sys_vars/r/hostname_basic.result
mysql-test/r/identity_basic.result => mysql-test/suite/sys_vars/r/identity_basic.result
mysql-test/r/identity_func.result => mysql-test/suite/sys_vars/r/identity_func.result
mysql-test/r/init_connect_basic.result => mysql-test/suite/sys_vars/r/init_connect_basic.result
mysql-test/r/init_slave_basic.result => mysql-test/suite/sys_vars/r/init_slave_basic.result
mysql-test/r/innodb_additional_mem_pool_size_basic.result => mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result
mysql-test/r/innodb_autoextend_increment_basic.result => mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result
mysql-test/r/innodb_autoinc_lock_mode_basic.result => mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result
mysql-test/r/innodb_autoinc_lock_mode_func.result => mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result
mysql-test/r/innodb_buffer_pool_size_basic.result => mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
mysql-test/r/innodb_checksums_basic.result => mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
mysql-test/r/innodb_commit_concurrency_basic.result => mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result
mysql-test/r/innodb_data_file_path_basic.result => mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
mysql-test/r/innodb_data_home_dir_basic.result => mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
mysql-test/r/innodb_doublewrite_basic.result => mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
mysql-test/r/innodb_fast_shutdown_basic.result => mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
mysql-test/r/innodb_file_io_threads_basic.result => mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result
mysql-test/r/innodb_file_per_table_basic.result => mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result
mysql-test/r/innodb_flush_log_at_trx_commit_basic.result => mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
mysql-test/r/innodb_flush_method_basic.result => mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result
mysql-test/r/innodb_force_recovery_basic.result => mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result
mysql-test/r/innodb_lock_wait_timeout_basic.result => mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result
mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result => mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
mysql-test/r/innodb_log_buffer_size_basic.result => mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result
mysql-test/r/innodb_log_file_size_basic.result => mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result
mysql-test/r/innodb_log_files_in_group_basic.result => mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result
mysql-test/r/innodb_log_group_home_dir_basic.result => mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
mysql-test/r/innodb_max_dirty_pages_pct_basic.result => mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
mysql-test/r/innodb_max_dirty_pages_pct_func.result => mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result
mysql-test/r/innodb_mirrored_log_groups_basic.result => mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result
mysql-test/r/innodb_open_files_basic.result => mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
mysql-test/r/innodb_rollback_on_timeout_basic.result => mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
mysql-test/r/innodb_support_xa_basic.result => mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result
mysql-test/r/innodb_support_xa_func.result => mysql-test/suite/sys_vars/r/innodb_support_xa_func.result
mysql-test/r/innodb_table_locks_basic.result => mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
mysql-test/r/innodb_table_locks_func.result => mysql-test/suite/sys_vars/r/innodb_table_locks_func.result
mysql-test/r/innodb_thread_concurrency_basic.result => mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
mysql-test/r/innodb_thread_sleep_delay_basic.result => mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
mysql-test/r/insert_id_basic.result => mysql-test/suite/sys_vars/r/insert_id_basic.result
mysql-test/r/insert_id_func.result => mysql-test/suite/sys_vars/r/insert_id_func.result
mysql-test/r/interactive_timeout_basic.result => mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
mysql-test/r/interactive_timeout_func.result => mysql-test/suite/sys_vars/r/interactive_timeout_func.result
mysql-test/r/keep_files_on_create_basic.result => mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
mysql-test/r/key_buffer_size_func.result => mysql-test/suite/sys_vars/r/key_buffer_size_func.result
mysql-test/r/last_insert_id_func.result => mysql-test/suite/sys_vars/r/last_insert_id_func.result
mysql-test/r/lc_time_names_basic.result => mysql-test/suite/sys_vars/r/lc_time_names_basic.result
mysql-test/r/lc_time_names_func.result => mysql-test/suite/sys_vars/r/lc_time_names_func.result
mysql-test/r/license_basic.result => mysql-test/suite/sys_vars/r/license_basic.result
mysql-test/r/local_infile_basic.result => mysql-test/suite/sys_vars/r/local_infile_basic.result
mysql-test/r/local_infile_func.result => mysql-test/suite/sys_vars/r/local_infile_func.result
mysql-test/r/log_basic.result => mysql-test/suite/sys_vars/r/log_basic.result
mysql-test/r/log_bin_trust_function_creators_basic.result => mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
mysql-test/r/log_bin_trust_function_creators_func.result => mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result
mysql-test/r/log_output_basic.result => mysql-test/suite/sys_vars/r/log_output_basic.result
mysql-test/r/log_output_func.result => mysql-test/suite/sys_vars/r/log_output_func.result
mysql-test/r/log_queries_not_using_indexes_basic.result => mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
mysql-test/r/long_query_time_basic.result => mysql-test/suite/sys_vars/r/long_query_time_basic.result
mysql-test/r/low_priority_updates_basic.result => mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
mysql-test/r/max_allowed_packet_basic.result => mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
mysql-test/r/max_allowed_packet_func.result => mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
mysql-test/r/max_binlog_cache_size_func.result => mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result
mysql-test/r/max_binlog_size_basic.result => mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
mysql-test/r/max_connections_basic.result => mysql-test/suite/sys_vars/r/max_connections_basic.result
mysql-test/r/max_delayed_threads_basic.result => mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
mysql-test/r/max_error_count_basic.result => mysql-test/suite/sys_vars/r/max_error_count_basic.result
mysql-test/r/max_insert_delayed_threads_basic.result => mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
mysql-test/r/max_join_size_func.result => mysql-test/suite/sys_vars/r/max_join_size_func.result
mysql-test/r/max_length_for_sort_data_basic.result => mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
mysql-test/r/max_prepared_stmt_count_basic.result => mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
mysql-test/r/max_prepared_stmt_count_func.result => mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result
mysql-test/r/max_relay_log_size_basic.result => mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
mysql-test/r/max_seeks_for_key_func.result => mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
mysql-test/r/max_sort_length_basic.result => mysql-test/suite/sys_vars/r/max_sort_length_basic.result
mysql-test/r/max_sort_length_func.result => mysql-test/suite/sys_vars/r/max_sort_length_func.result
mysql-test/r/max_sp_recursion_depth_basic.result => mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
mysql-test/r/max_sp_recursion_depth_func.result => mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result
mysql-test/r/max_user_connections_basic.result => mysql-test/suite/sys_vars/r/max_user_connections_basic.result
mysql-test/r/max_user_connections_func.result => mysql-test/suite/sys_vars/r/max_user_connections_func.result
mysql-test/r/myisam_data_pointer_size_basic.result => mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
mysql-test/r/myisam_data_pointer_size_func.result => mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result
mysql-test/r/myisam_sort_buffer_size_basic.result => mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
mysql-test/r/myisam_stats_method_basic.result => mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result
mysql-test/r/myisam_stats_method_func.result => mysql-test/suite/sys_vars/r/myisam_stats_method_func.result
mysql-test/r/myisam_use_mmap_basic.result => mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result
mysql-test/r/ndb_log_update_as_write_basic.result => mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result
mysql-test/r/ndb_log_updated_only_basic.result => mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result
mysql-test/r/net_buffer_length_basic.result => mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
mysql-test/r/net_read_timeout_basic.result => mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
mysql-test/r/net_write_timeout_basic.result => mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
mysql-test/r/new_basic.result => mysql-test/suite/sys_vars/r/new_basic.result
mysql-test/r/old_passwords_basic.result => mysql-test/suite/sys_vars/r/old_passwords_basic.result
mysql-test/r/old_passwords_func.result => mysql-test/suite/sys_vars/r/old_passwords_func.result
mysql-test/r/optimizer_prune_level_basic.result => mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
mysql-test/r/optimizer_search_depth_basic.result => mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
mysql-test/r/preload_buffer_size_basic.result => mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
mysql-test/r/query_cache_limit_func.result => mysql-test/suite/sys_vars/r/query_cache_limit_func.result
mysql-test/r/query_cache_type_basic.result => mysql-test/suite/sys_vars/r/query_cache_type_basic.result
mysql-test/r/query_cache_type_func.result => mysql-test/suite/sys_vars/r/query_cache_type_func.result
mysql-test/r/query_cache_wlock_invalidate_basic.result => mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
mysql-test/r/query_cache_wlock_invalidate_func.result => mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
mysql-test/r/query_prealloc_size_func.result => mysql-test/suite/sys_vars/r/query_prealloc_size_func.result
mysql-test/r/read_buffer_size_basic.result => mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
mysql-test/r/read_only_basic.result => mysql-test/suite/sys_vars/r/read_only_basic.result
mysql-test/r/read_only_func.result => mysql-test/suite/sys_vars/r/read_only_func.result
mysql-test/r/read_rnd_buffer_size_basic.result => mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
mysql-test/r/relay_log_purge_basic.result => mysql-test/suite/sys_vars/r/relay_log_purge_basic.result
mysql-test/r/rpl_init_slave_func.result => mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
mysql-test/r/rpl_max_binlog_size_func.result => mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
mysql-test/r/rpl_slave_allow_batching_basic.result => mysql-test/suite/sys_vars/r/rpl_slave_allow_batching_basic.result
mysql-test/r/rpl_slave_compressed_protocol_basic.result => mysql-test/suite/sys_vars/r/rpl_slave_compressed_protocol_basic.result
mysql-test/r/rpl_slave_exec_mode_basic.result => mysql-test/suite/sys_vars/r/rpl_slave_exec_mode_basic.result
mysql-test/r/rpl_slave_net_timeout_basic.result => mysql-test/suite/sys_vars/r/rpl_slave_net_timeout_basic.result
mysql-test/r/secure_auth_basic.result => mysql-test/suite/sys_vars/r/secure_auth_basic.result
mysql-test/r/secure_auth_func.result => mysql-test/suite/sys_vars/r/secure_auth_func.result
mysql-test/r/slave_allow_batching_basic.result => mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result
mysql-test/r/slave_compressed_protocol_basic.result => mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result
mysql-test/r/slave_net_timeout_basic.result => mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
mysql-test/r/slow_launch_time_basic.result => mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
mysql-test/r/slow_launch_time_func.result => mysql-test/suite/sys_vars/r/slow_launch_time_func.result
mysql-test/r/slow_query_log_basic.result => mysql-test/suite/sys_vars/r/slow_query_log_basic.result
mysql-test/r/slow_query_log_file_basic.result => mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
mysql-test/r/slow_query_log_file_func.result => mysql-test/suite/sys_vars/r/slow_query_log_file_func.result
mysql-test/r/slow_query_log_func.result => mysql-test/suite/sys_vars/r/slow_query_log_func.result
mysql-test/r/sql_auto_is_null_basic.result => mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result
mysql-test/r/sql_big_selects_basic.result => mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
mysql-test/r/sql_big_selects_func.result => mysql-test/suite/sys_vars/r/sql_big_selects_func.result
mysql-test/r/sql_big_tables_basic.result => mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
mysql-test/r/sql_big_tables_func.result => mysql-test/suite/sys_vars/r/sql_big_tables_func.result
mysql-test/r/sql_buffer_result_basic.result => mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
mysql-test/r/sql_buffer_result_func.result => mysql-test/suite/sys_vars/r/sql_buffer_result_func.result
mysql-test/r/sql_log_bin_basic.result => mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
mysql-test/r/sql_log_off_basic.result => mysql-test/suite/sys_vars/r/sql_log_off_basic.result
mysql-test/r/sql_log_off_func.result => mysql-test/suite/sys_vars/r/sql_log_off_func.result
mysql-test/r/sql_low_priority_updates_basic.result => mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
mysql-test/r/sql_low_priority_updates_func.result => mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
mysql-test/r/sql_max_join_size_func.result => mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
mysql-test/r/sql_mode_basic.result => mysql-test/suite/sys_vars/r/sql_mode_basic.result
mysql-test/r/sql_mode_func.result => mysql-test/suite/sys_vars/r/sql_mode_func.result
mysql-test/r/sql_notes_basic.result => mysql-test/suite/sys_vars/r/sql_notes_basic.result
mysql-test/r/sql_notes_func.result => mysql-test/suite/sys_vars/r/sql_notes_func.result
mysql-test/r/sql_quote_show_create_basic.result => mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
mysql-test/r/sql_quote_show_create_func.result => mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result
mysql-test/r/sql_safe_updates_basic.result => mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
mysql-test/r/sql_safe_updates_func.result => mysql-test/suite/sys_vars/r/sql_safe_updates_func.result
mysql-test/r/sql_select_limit_func.result => mysql-test/suite/sys_vars/r/sql_select_limit_func.result
mysql-test/r/sql_slave_skip_counter_basic.result => mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result
mysql-test/r/sql_warnings_basic.result => mysql-test/suite/sys_vars/r/sql_warnings_basic.result
mysql-test/r/sql_warnings_func.result => mysql-test/suite/sys_vars/r/sql_warnings_func.result
mysql-test/r/ssl_ca_basic.result => mysql-test/suite/sys_vars/r/ssl_ca_basic.result
mysql-test/r/ssl_capath_basic.result => mysql-test/suite/sys_vars/r/ssl_capath_basic.result
mysql-test/r/ssl_cert_basic.result => mysql-test/suite/sys_vars/r/ssl_cert_basic.result
mysql-test/r/ssl_cipher_basic.result => mysql-test/suite/sys_vars/r/ssl_cipher_basic.result
mysql-test/r/ssl_key_basic.result => mysql-test/suite/sys_vars/r/ssl_key_basic.result
mysql-test/r/storage_engine_basic.result => mysql-test/suite/sys_vars/r/storage_engine_basic.result
mysql-test/r/sync_frm_basic.result => mysql-test/suite/sys_vars/r/sync_frm_basic.result
mysql-test/r/system_time_zone_basic.result => mysql-test/suite/sys_vars/r/system_time_zone_basic.result
mysql-test/r/table_definition_cache_basic.result => mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
mysql-test/r/table_lock_wait_timeout_basic.result => mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
mysql-test/r/table_open_cache_basic.result => mysql-test/suite/sys_vars/r/table_open_cache_basic.result
mysql-test/r/thread_cache_size_func.result => mysql-test/suite/sys_vars/r/thread_cache_size_func.result
mysql-test/r/thread_handling_basic.result => mysql-test/suite/sys_vars/r/thread_handling_basic.result
mysql-test/r/time_zone_basic.result => mysql-test/suite/sys_vars/r/time_zone_basic.result
mysql-test/r/time_zone_func.result => mysql-test/suite/sys_vars/r/time_zone_func.result
mysql-test/r/timed_mutexes_basic.result => mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
mysql-test/r/timestamp_func.result => mysql-test/suite/sys_vars/r/timestamp_func.result
mysql-test/r/timestamp_sysdate_is_now_func.result => mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
mysql-test/r/tmpdir_basic.result => mysql-test/suite/sys_vars/r/tmpdir_basic.result
mysql-test/r/tx_isolation_basic.result => mysql-test/suite/sys_vars/r/tx_isolation_basic.result
mysql-test/r/tx_isolation_func.result => mysql-test/suite/sys_vars/r/tx_isolation_func.result
mysql-test/r/unique_checks_basic.result => mysql-test/suite/sys_vars/r/unique_checks_basic.result
mysql-test/r/updatable_views_with_limit_basic.result => mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
mysql-test/r/updatable_views_with_limit_func.result => mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result
mysql-test/r/version_basic.result => mysql-test/suite/sys_vars/r/version_basic.result
mysql-test/r/version_comment_basic.result => mysql-test/suite/sys_vars/r/version_comment_basic.result
mysql-test/r/version_compile_machine_basic.result => mysql-test/suite/sys_vars/r/version_compile_machine_basic.result
mysql-test/r/version_compile_os_basic.result => mysql-test/suite/sys_vars/r/version_compile_os_basic.result
mysql-test/r/wait_timeout_func.result => mysql-test/suite/sys_vars/r/wait_timeout_func.result
mysql-test/r/warning_count_basic.result => mysql-test/suite/sys_vars/r/warning_count_basic.result
mysql-test/t/auto_commit_basic.test => mysql-test/suite/sys_vars/t/auto_commit_basic.test
mysql-test/t/auto_increment_increment_basic.test => mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test
mysql-test/t/auto_increment_increment_func.test => mysql-test/suite/sys_vars/t/auto_increment_increment_func.test
mysql-test/t/auto_increment_offset_basic.test => mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test
mysql-test/t/auto_increment_offset_func.test => mysql-test/suite/sys_vars/t/auto_increment_offset_func.test
mysql-test/t/autocommit_func-master.opt => mysql-test/suite/sys_vars/t/autocommit_func-master.opt
mysql-test/t/autocommit_func.test => mysql-test/suite/sys_vars/t/autocommit_func.test
mysql-test/t/automatic_sp_privileges_basic.test => mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
mysql-test/t/automatic_sp_privileges_func.test => mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test
mysql-test/t/basedir_basic.test => mysql-test/suite/sys_vars/t/basedir_basic.test
mysql-test/t/big_tables_basic.test => mysql-test/suite/sys_vars/t/big_tables_basic.test
mysql-test/t/binlog_format_basic.test => mysql-test/suite/sys_vars/t/binlog_format_basic.test
mysql-test/t/character_set_client_basic.test => mysql-test/suite/sys_vars/t/character_set_client_basic.test
mysql-test/t/character_set_client_func.test => mysql-test/suite/sys_vars/t/character_set_client_func.test
mysql-test/t/character_set_connection_basic.test => mysql-test/suite/sys_vars/t/character_set_connection_basic.test
mysql-test/t/character_set_connection_func.test => mysql-test/suite/sys_vars/t/character_set_connection_func.test
mysql-test/t/character_set_database_basic.test => mysql-test/suite/sys_vars/t/character_set_database_basic.test
mysql-test/t/character_set_database_func.test => mysql-test/suite/sys_vars/t/character_set_database_func.test
mysql-test/t/character_set_filesystem_basic.test => mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
mysql-test/t/character_set_filesystem_func-master.opt => mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt
mysql-test/t/character_set_results_basic.test => mysql-test/suite/sys_vars/t/character_set_results_basic.test
mysql-test/t/character_set_results_func.test => mysql-test/suite/sys_vars/t/character_set_results_func.test
mysql-test/t/character_set_server_basic.test => mysql-test/suite/sys_vars/t/character_set_server_basic.test
mysql-test/t/character_set_server_func.test => mysql-test/suite/sys_vars/t/character_set_server_func.test
mysql-test/t/character_set_system_basic.test => mysql-test/suite/sys_vars/t/character_set_system_basic.test
mysql-test/t/collation_connection_basic.test => mysql-test/suite/sys_vars/t/collation_connection_basic.test
mysql-test/t/collation_connection_func.test => mysql-test/suite/sys_vars/t/collation_connection_func.test
mysql-test/t/collation_database_basic.test => mysql-test/suite/sys_vars/t/collation_database_basic.test
mysql-test/t/collation_database_func.test => mysql-test/suite/sys_vars/t/collation_database_func.test
mysql-test/t/collation_server_basic.test => mysql-test/suite/sys_vars/t/collation_server_basic.test
mysql-test/t/collation_server_func.test => mysql-test/suite/sys_vars/t/collation_server_func.test
mysql-test/t/completion_type_basic.test => mysql-test/suite/sys_vars/t/completion_type_basic.test
mysql-test/t/completion_type_func-master.opt => mysql-test/suite/sys_vars/t/completion_type_func-master.opt
mysql-test/t/completion_type_func.test => mysql-test/suite/sys_vars/t/completion_type_func.test
mysql-test/t/concurrent_insert_basic.test => mysql-test/suite/sys_vars/t/concurrent_insert_basic.test
mysql-test/t/concurrent_insert_func.test => mysql-test/suite/sys_vars/t/concurrent_insert_func.test
mysql-test/t/connect_timeout_basic.test => mysql-test/suite/sys_vars/t/connect_timeout_basic.test
mysql-test/t/datadir_basic.test => mysql-test/suite/sys_vars/t/datadir_basic.test
mysql-test/t/default_week_format_basic.test => mysql-test/suite/sys_vars/t/default_week_format_basic.test
mysql-test/t/default_week_format_func.test => mysql-test/suite/sys_vars/t/default_week_format_func.test
mysql-test/t/delay_key_write_basic.test => mysql-test/suite/sys_vars/t/delay_key_write_basic.test
mysql-test/t/delay_key_write_func-master.opt => mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt
mysql-test/t/delay_key_write_func.test => mysql-test/suite/sys_vars/t/delay_key_write_func.test
mysql-test/t/delayed_insert_limit_func.test => mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
mysql-test/t/delayed_insert_timeout_basic.test => mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test
mysql-test/t/div_precision_increment_basic.test => mysql-test/suite/sys_vars/t/div_precision_increment_basic.test
mysql-test/t/div_precision_increment_func.test => mysql-test/suite/sys_vars/t/div_precision_increment_func.test
mysql-test/t/engine_condition_pushdown_basic.test => mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
mysql-test/t/error_count_basic.test => mysql-test/suite/sys_vars/t/error_count_basic.test
mysql-test/t/event_scheduler_basic.test => mysql-test/suite/sys_vars/t/event_scheduler_basic.test
mysql-test/t/event_scheduler_func.test => mysql-test/suite/sys_vars/t/event_scheduler_func.test
mysql-test/t/expire_logs_days_basic.test => mysql-test/suite/sys_vars/t/expire_logs_days_basic.test
mysql-test/t/flush_basic.test => mysql-test/suite/sys_vars/t/flush_basic.test
mysql-test/t/foreign_key_checks_basic.test => mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
mysql-test/t/foreign_key_checks_func.test => mysql-test/suite/sys_vars/t/foreign_key_checks_func.test
mysql-test/t/ft_boolean_syntax_basic.test => mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test
mysql-test/t/ft_boolean_syntax_func.test => mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test
mysql-test/t/general_log_basic.test => mysql-test/suite/sys_vars/t/general_log_basic.test
mysql-test/t/general_log_file_basic-master.opt => mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt
mysql-test/t/general_log_file_basic.test => mysql-test/suite/sys_vars/t/general_log_file_basic.test
mysql-test/t/general_log_file_func-master.opt => mysql-test/suite/sys_vars/t/general_log_file_func-master.opt
mysql-test/t/general_log_file_func.test => mysql-test/suite/sys_vars/t/general_log_file_func.test
mysql-test/t/general_log_func.test => mysql-test/suite/sys_vars/t/general_log_func.test
mysql-test/t/group_concat_max_len_basic.test => mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test
mysql-test/t/group_concat_max_len_func.test => mysql-test/suite/sys_vars/t/group_concat_max_len_func.test
mysql-test/t/have_compress_basic.test => mysql-test/suite/sys_vars/t/have_compress_basic.test
mysql-test/t/have_crypt_basic.test => mysql-test/suite/sys_vars/t/have_crypt_basic.test
mysql-test/t/have_csv_basic.test => mysql-test/suite/sys_vars/t/have_csv_basic.test
mysql-test/t/have_dynamic_loading_basic.test => mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test
mysql-test/t/have_geometry_basic.test => mysql-test/suite/sys_vars/t/have_geometry_basic.test
mysql-test/t/have_innodb_basic.test => mysql-test/suite/sys_vars/t/have_innodb_basic.test
mysql-test/t/have_ndbcluster_basic.test => mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test
mysql-test/t/have_openssl_basic.test => mysql-test/suite/sys_vars/t/have_openssl_basic.test
mysql-test/t/have_partitioning_basic.test => mysql-test/suite/sys_vars/t/have_partitioning_basic.test
mysql-test/t/have_query_cache_basic.test => mysql-test/suite/sys_vars/t/have_query_cache_basic.test
mysql-test/t/have_rtree_keys_basic.test => mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test
mysql-test/t/have_ssl_basic.test => mysql-test/suite/sys_vars/t/have_ssl_basic.test
mysql-test/t/have_symlink_basic.test => mysql-test/suite/sys_vars/t/have_symlink_basic.test
mysql-test/t/hostname_basic.test => mysql-test/suite/sys_vars/t/hostname_basic.test
mysql-test/t/identity_basic.test => mysql-test/suite/sys_vars/t/identity_basic.test
mysql-test/t/identity_func-master.opt => mysql-test/suite/sys_vars/t/identity_func-master.opt
mysql-test/t/identity_func.test => mysql-test/suite/sys_vars/t/identity_func.test
mysql-test/t/init_connect_basic.test => mysql-test/suite/sys_vars/t/init_connect_basic.test
mysql-test/t/init_slave_basic.test => mysql-test/suite/sys_vars/t/init_slave_basic.test
mysql-test/t/innodb_additional_mem_pool_size_basic.test => mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test
mysql-test/t/innodb_autoextend_increment_basic.test => mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test
mysql-test/t/innodb_autoinc_lock_mode_basic.test => mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test
mysql-test/t/innodb_autoinc_lock_mode_func-master.opt => mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt
mysql-test/t/innodb_autoinc_lock_mode_func.test => mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
mysql-test/t/innodb_buffer_pool_size_basic.test => mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
mysql-test/t/innodb_checksums_basic.test => mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
mysql-test/t/innodb_commit_concurrency_basic.test => mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test
mysql-test/t/innodb_data_file_path_basic.test => mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test
mysql-test/t/innodb_data_home_dir_basic.test => mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test
mysql-test/t/innodb_doublewrite_basic.test => mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test
mysql-test/t/innodb_fast_shutdown_basic.test => mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
mysql-test/t/innodb_file_io_threads_basic.test => mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test
mysql-test/t/innodb_file_per_table_basic.test => mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test
mysql-test/t/innodb_flush_log_at_trx_commit_basic.test => mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
mysql-test/t/innodb_flush_method_basic.test => mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test
mysql-test/t/innodb_force_recovery_basic.test => mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test
mysql-test/t/innodb_lock_wait_timeout_basic.test => mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test
mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test => mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
mysql-test/t/innodb_log_buffer_size_basic.test => mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test
mysql-test/t/innodb_log_file_size_basic.test => mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test
mysql-test/t/innodb_log_files_in_group_basic.test => mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test
mysql-test/t/innodb_log_group_home_dir_basic.test => mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test
mysql-test/t/innodb_max_dirty_pages_pct_basic.test => mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
mysql-test/t/innodb_max_dirty_pages_pct_func.test => mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test
mysql-test/t/innodb_mirrored_log_groups_basic.test => mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test
mysql-test/t/innodb_open_files_basic.test => mysql-test/suite/sys_vars/t/innodb_open_files_basic.test
mysql-test/t/innodb_rollback_on_timeout_basic.test => mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
mysql-test/t/innodb_support_xa_basic.test => mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
mysql-test/t/innodb_support_xa_func.test => mysql-test/suite/sys_vars/t/innodb_support_xa_func.test
mysql-test/t/innodb_table_locks_basic.test => mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
mysql-test/t/innodb_table_locks_func.test => mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
mysql-test/t/innodb_thread_concurrency_basic.test => mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
mysql-test/t/insert_id_basic.test => mysql-test/suite/sys_vars/t/insert_id_basic.test
mysql-test/t/insert_id_func.test => mysql-test/suite/sys_vars/t/insert_id_func.test
mysql-test/t/interactive_timeout_basic.test => mysql-test/suite/sys_vars/t/interactive_timeout_basic.test
mysql-test/t/interactive_timeout_func.test => mysql-test/suite/sys_vars/t/interactive_timeout_func.test
mysql-test/t/keep_files_on_create_basic.test => mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
mysql-test/t/key_buffer_size_func.test => mysql-test/suite/sys_vars/t/key_buffer_size_func.test
mysql-test/t/last_insert_id_func-master.opt => mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt
mysql-test/t/last_insert_id_func.test => mysql-test/suite/sys_vars/t/last_insert_id_func.test
mysql-test/t/lc_time_names_basic.test => mysql-test/suite/sys_vars/t/lc_time_names_basic.test
mysql-test/t/lc_time_names_func.test => mysql-test/suite/sys_vars/t/lc_time_names_func.test
mysql-test/t/license_basic.test => mysql-test/suite/sys_vars/t/license_basic.test
mysql-test/t/local_infile_basic.test => mysql-test/suite/sys_vars/t/local_infile_basic.test
mysql-test/t/local_infile_func.test => mysql-test/suite/sys_vars/t/local_infile_func.test
mysql-test/t/log_basic.test => mysql-test/suite/sys_vars/t/log_basic.test
mysql-test/t/log_bin_trust_function_creators_basic.test => mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
mysql-test/t/log_bin_trust_function_creators_func.test => mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test
mysql-test/t/log_output_basic.test => mysql-test/suite/sys_vars/t/log_output_basic.test
mysql-test/t/log_output_func.test => mysql-test/suite/sys_vars/t/log_output_func.test
mysql-test/t/log_queries_not_using_indexes_basic.test => mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
mysql-test/t/long_query_time_basic.test => mysql-test/suite/sys_vars/t/long_query_time_basic.test
mysql-test/t/low_priority_updates_basic.test => mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
mysql-test/t/max_allowed_packet_basic.test => mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test
mysql-test/t/max_allowed_packet_func.test => mysql-test/suite/sys_vars/t/max_allowed_packet_func.test
mysql-test/t/max_binlog_cache_size_func-master.opt => mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt
mysql-test/t/max_binlog_size_basic.test => mysql-test/suite/sys_vars/t/max_binlog_size_basic.test
mysql-test/t/max_connections_basic.test => mysql-test/suite/sys_vars/t/max_connections_basic.test
mysql-test/t/max_delayed_threads_basic.test => mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test
mysql-test/t/max_error_count_basic.test => mysql-test/suite/sys_vars/t/max_error_count_basic.test
mysql-test/t/max_insert_delayed_threads_basic.test => mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
mysql-test/t/max_join_size_func.test => mysql-test/suite/sys_vars/t/max_join_size_func.test
mysql-test/t/max_length_for_sort_data_basic.test => mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test
mysql-test/t/max_prepared_stmt_count_basic.test => mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test
mysql-test/t/max_prepared_stmt_count_func.test => mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test
mysql-test/t/max_relay_log_size_basic.test => mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test
mysql-test/t/max_seeks_for_key_func.test => mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test
mysql-test/t/max_sort_length_basic.test => mysql-test/suite/sys_vars/t/max_sort_length_basic.test
mysql-test/t/max_sort_length_func.test => mysql-test/suite/sys_vars/t/max_sort_length_func.test
mysql-test/t/max_sp_recursion_depth_basic.test => mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test
mysql-test/t/max_sp_recursion_depth_func.test => mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test
mysql-test/t/max_user_connections_basic.test => mysql-test/suite/sys_vars/t/max_user_connections_basic.test
mysql-test/t/max_user_connections_func.test => mysql-test/suite/sys_vars/t/max_user_connections_func.test
mysql-test/t/myisam_data_pointer_size_basic.test => mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test
mysql-test/t/myisam_data_pointer_size_func.test => mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
mysql-test/t/myisam_stats_method_basic.test => mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test
mysql-test/t/myisam_stats_method_func.test => mysql-test/suite/sys_vars/t/myisam_stats_method_func.test
mysql-test/t/myisam_use_mmap_basic.test => mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test
mysql-test/t/ndb_log_update_as_write_basic.test => mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test
mysql-test/t/ndb_log_updated_only_basic.test => mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test
mysql-test/t/net_buffer_length_basic.test => mysql-test/suite/sys_vars/t/net_buffer_length_basic.test
mysql-test/t/net_read_timeout_basic.test => mysql-test/suite/sys_vars/t/net_read_timeout_basic.test
mysql-test/t/net_write_timeout_basic.test => mysql-test/suite/sys_vars/t/net_write_timeout_basic.test
mysql-test/t/new_basic.test => mysql-test/suite/sys_vars/t/new_basic.test
mysql-test/t/old_passwords_basic.test => mysql-test/suite/sys_vars/t/old_passwords_basic.test
mysql-test/t/old_passwords_func.test => mysql-test/suite/sys_vars/t/old_passwords_func.test
mysql-test/t/optimizer_prune_level_basic.test => mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test
mysql-test/t/optimizer_search_depth_basic.test => mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test
mysql-test/t/preload_buffer_size_basic.test => mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test
mysql-test/t/query_cache_limit_func.test => mysql-test/suite/sys_vars/t/query_cache_limit_func.test
mysql-test/t/query_cache_type_basic.test => mysql-test/suite/sys_vars/t/query_cache_type_basic.test
mysql-test/t/query_cache_type_func.test => mysql-test/suite/sys_vars/t/query_cache_type_func.test
mysql-test/t/query_cache_wlock_invalidate_basic.test => mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
mysql-test/t/query_cache_wlock_invalidate_func.test => mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
mysql-test/t/query_prealloc_size_func.test => mysql-test/suite/sys_vars/t/query_prealloc_size_func.test
mysql-test/t/read_buffer_size_basic.test => mysql-test/suite/sys_vars/t/read_buffer_size_basic.test
mysql-test/t/read_only_basic.test => mysql-test/suite/sys_vars/t/read_only_basic.test
mysql-test/t/read_only_func.test => mysql-test/suite/sys_vars/t/read_only_func.test
mysql-test/t/read_rnd_buffer_size_basic.test => mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test
mysql-test/t/relay_log_purge_basic.test => mysql-test/suite/sys_vars/t/relay_log_purge_basic.test
mysql-test/t/rpl_init_slave_func.test => mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
mysql-test/t/rpl_max_binlog_size_func-master.opt => mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt
mysql-test/t/rpl_max_binlog_size_func.test => mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
mysql-test/t/rpl_slave_allow_batching_basic.test => mysql-test/suite/sys_vars/t/rpl_slave_allow_batching_basic.test
mysql-test/t/rpl_slave_compressed_protocol_basic.test => mysql-test/suite/sys_vars/t/rpl_slave_compressed_protocol_basic.test
mysql-test/t/rpl_slave_exec_mode_basic.test => mysql-test/suite/sys_vars/t/rpl_slave_exec_mode_basic.test
mysql-test/t/rpl_slave_net_timeout_basic.test => mysql-test/suite/sys_vars/t/rpl_slave_net_timeout_basic.test
mysql-test/t/secure_auth_basic.test => mysql-test/suite/sys_vars/t/secure_auth_basic.test
mysql-test/t/secure_auth_func-master.opt => mysql-test/suite/sys_vars/t/secure_auth_func-master.opt
mysql-test/t/secure_auth_func.test => mysql-test/suite/sys_vars/t/secure_auth_func.test
mysql-test/t/slave_allow_batching_basic.test => mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test
mysql-test/t/slave_compressed_protocol_basic.test => mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test
mysql-test/t/slave_net_timeout_basic.test => mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test
mysql-test/t/slow_launch_time_basic.test => mysql-test/suite/sys_vars/t/slow_launch_time_basic.test
mysql-test/t/slow_launch_time_func.test => mysql-test/suite/sys_vars/t/slow_launch_time_func.test
mysql-test/t/slow_query_log_basic.test => mysql-test/suite/sys_vars/t/slow_query_log_basic.test
mysql-test/t/slow_query_log_file_basic-master.opt => mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt
mysql-test/t/slow_query_log_file_basic.test => mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
mysql-test/t/slow_query_log_file_func-master.opt => mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt
mysql-test/t/slow_query_log_file_func.test => mysql-test/suite/sys_vars/t/slow_query_log_file_func.test
mysql-test/t/slow_query_log_func.test => mysql-test/suite/sys_vars/t/slow_query_log_func.test
mysql-test/t/sql_auto_is_null_basic.test => mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test
mysql-test/t/sql_big_selects_basic.test => mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
mysql-test/t/sql_big_selects_func.test => mysql-test/suite/sys_vars/t/sql_big_selects_func.test
mysql-test/t/sql_big_tables_basic.test => mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
mysql-test/t/sql_big_tables_func.test => mysql-test/suite/sys_vars/t/sql_big_tables_func.test
mysql-test/t/sql_buffer_result_basic.test => mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
mysql-test/t/sql_buffer_result_func.test => mysql-test/suite/sys_vars/t/sql_buffer_result_func.test
mysql-test/t/sql_log_bin_basic.test => mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
mysql-test/t/sql_log_off_basic.test => mysql-test/suite/sys_vars/t/sql_log_off_basic.test
mysql-test/t/sql_log_off_func.test => mysql-test/suite/sys_vars/t/sql_log_off_func.test
mysql-test/t/sql_low_priority_updates_basic.test => mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
mysql-test/t/sql_low_priority_updates_func.test => mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
mysql-test/t/sql_max_join_size_func.test => mysql-test/suite/sys_vars/t/sql_max_join_size_func.test
mysql-test/t/sql_mode_basic.test => mysql-test/suite/sys_vars/t/sql_mode_basic.test
mysql-test/t/sql_mode_func.test => mysql-test/suite/sys_vars/t/sql_mode_func.test
mysql-test/t/sql_notes_basic.test => mysql-test/suite/sys_vars/t/sql_notes_basic.test
mysql-test/t/sql_notes_func.test => mysql-test/suite/sys_vars/t/sql_notes_func.test
mysql-test/t/sql_quote_show_create_basic.test => mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
mysql-test/t/sql_quote_show_create_func.test => mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test
mysql-test/t/sql_safe_updates_basic.test => mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
mysql-test/t/sql_safe_updates_func.test => mysql-test/suite/sys_vars/t/sql_safe_updates_func.test
mysql-test/t/sql_select_limit_func.test => mysql-test/suite/sys_vars/t/sql_select_limit_func.test
mysql-test/t/sql_slave_skip_counter_basic.test => mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test
mysql-test/t/sql_warnings_basic.test => mysql-test/suite/sys_vars/t/sql_warnings_basic.test
mysql-test/t/sql_warnings_func.test => mysql-test/suite/sys_vars/t/sql_warnings_func.test
mysql-test/t/ssl_ca_basic.test => mysql-test/suite/sys_vars/t/ssl_ca_basic.test
mysql-test/t/ssl_capath_basic.test => mysql-test/suite/sys_vars/t/ssl_capath_basic.test
mysql-test/t/ssl_cert_basic.test => mysql-test/suite/sys_vars/t/ssl_cert_basic.test
mysql-test/t/ssl_cipher_basic.test => mysql-test/suite/sys_vars/t/ssl_cipher_basic.test
mysql-test/t/ssl_key_basic.test => mysql-test/suite/sys_vars/t/ssl_key_basic.test
mysql-test/t/storage_engine_basic-master.opt => mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt
mysql-test/t/storage_engine_basic.test => mysql-test/suite/sys_vars/t/storage_engine_basic.test
mysql-test/t/sync_frm_basic.test => mysql-test/suite/sys_vars/t/sync_frm_basic.test
mysql-test/t/system_time_zone_basic.test => mysql-test/suite/sys_vars/t/system_time_zone_basic.test
mysql-test/t/table_definition_cache_basic.test => mysql-test/suite/sys_vars/t/table_definition_cache_basic.test
mysql-test/t/table_lock_wait_timeout_basic.test => mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test
mysql-test/t/table_open_cache_basic.test => mysql-test/suite/sys_vars/t/table_open_cache_basic.test
mysql-test/t/thread_cache_size_func.test => mysql-test/suite/sys_vars/t/thread_cache_size_func.test
mysql-test/t/thread_handling_basic.test => mysql-test/suite/sys_vars/t/thread_handling_basic.test
mysql-test/t/time_zone_basic.test => mysql-test/suite/sys_vars/t/time_zone_basic.test
mysql-test/t/time_zone_func.test => mysql-test/suite/sys_vars/t/time_zone_func.test
mysql-test/t/timed_mutexes_basic.test => mysql-test/suite/sys_vars/t/timed_mutexes_basic.test
mysql-test/t/timestamp_func.test => mysql-test/suite/sys_vars/t/timestamp_func.test
mysql-test/t/timestamp_sysdate_is_now_func-master.opt => mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt
mysql-test/t/timestamp_sysdate_is_now_func.test => mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
mysql-test/t/tmpdir_basic.test => mysql-test/suite/sys_vars/t/tmpdir_basic.test
mysql-test/t/tx_isolation_basic.test => mysql-test/suite/sys_vars/t/tx_isolation_basic.test
mysql-test/t/tx_isolation_func-master.opt => mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
mysql-test/t/tx_isolation_func.test => mysql-test/suite/sys_vars/t/tx_isolation_func.test
mysql-test/t/unique_checks_basic.test => mysql-test/suite/sys_vars/t/unique_checks_basic.test
mysql-test/t/updatable_views_with_limit_basic.test => mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test
mysql-test/t/updatable_views_with_limit_func.test => mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test
mysql-test/t/version_basic.test => mysql-test/suite/sys_vars/t/version_basic.test
mysql-test/t/version_comment_basic.test => mysql-test/suite/sys_vars/t/version_comment_basic.test
mysql-test/t/version_compile_machine_basic.test => mysql-test/suite/sys_vars/t/version_compile_machine_basic.test
mysql-test/t/version_compile_os_basic.test => mysql-test/suite/sys_vars/t/version_compile_os_basic.test
mysql-test/t/wait_timeout_func.test => mysql-test/suite/sys_vars/t/wait_timeout_func.test
mysql-test/t/warning_count_basic.test => mysql-test/suite/sys_vars/t/warning_count_basic.test
modified:
mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/inc/timestamp_basic.inc
mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/timestamp_basic_32.result
mysql-test/suite/sys_vars/r/timestamp_basic_64.result
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/t/disabled.def
storage/falcon/StorageVersion.h
mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
mysql-test/suite/sys_vars/t/character_set_client_basic.test
mysql-test/suite/sys_vars/t/character_set_connection_basic.test
mysql-test/suite/sys_vars/t/character_set_database_basic.test
mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
mysql-test/suite/sys_vars/t/character_set_results_basic.test
mysql-test/suite/sys_vars/t/character_set_server_basic.test
mysql-test/suite/sys_vars/t/collation_connection_basic.test
mysql-test/suite/sys_vars/t/collation_database_basic.test
mysql-test/suite/sys_vars/t/collation_server_basic.test
mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
=== renamed file 'mysql-test/include/charset_basic.inc' => 'mysql-test/suite/sys_vars/inc/charset_basic.inc'
=== renamed file 'mysql-test/include/collation_basic.inc' => 'mysql-test/suite/sys_vars/inc/collation_basic.inc'
=== modified file 'mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc 2008-12-19 14:11:02 +0000
@@ -72,9 +72,9 @@ SELECT @@session.join_buffer_size = 1310
##########################################################################
SET @@global.join_buffer_size = 8200;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-SET @@global.join_buffer_size = 65536;
SELECT @@global.join_buffer_size;
+SELECT @@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228;
+SET @@global.join_buffer_size = 65536;
SET @@global.join_buffer_size = 4294967295;
SELECT @@global.join_buffer_size;
echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
@@ -86,7 +86,7 @@ echo 'Bug # 34837: Errors are not coming
###########################################################################
SET @@session.join_buffer_size = 8200;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SELECT @@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228;
SET @@session.join_buffer_size = 65536;
SELECT @@session.join_buffer_size;
SET @@session.join_buffer_size = 4294967295;
@@ -100,11 +100,13 @@ echo 'Bug # 34837: Errors are not coming
############################################################
SET @@global.join_buffer_size = 0;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size;
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
SET @@global.join_buffer_size = -1024;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size;
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
SET @@global.join_buffer_size = 8199;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228;
SET @@global.join_buffer_size = 42949672951;
SELECT @@global.join_buffer_size;
@@ -116,11 +118,11 @@ SET @@global.join_buffer_size = test;
SELECT @@global.join_buffer_size;
SET @@session.join_buffer_size = 0;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
SET @@session.join_buffer_size = -2;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
SET @@session.join_buffer_size = 8199;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SELECT @@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228;
SET @@session.join_buffer_size = 42949672951;
SELECT @@session.join_buffer_size;
@@ -160,9 +162,9 @@ WHERE VARIABLE_NAME='join_buffer_size';
####################################################################
SET @@global.join_buffer_size = TRUE;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
SET @@global.join_buffer_size = FALSE;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
--echo 'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
@@ -191,7 +193,7 @@ SELECT @@local.join_buffer_size = @@sess
##############################################################################
SET join_buffer_size = 1;
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
+SELECT @@join_buffer_size=164 OR @@join_buffer_size= 8228;
--Error ER_UNKNOWN_TABLE
SELECT local.join_buffer_size;
--Error ER_UNKNOWN_TABLE
=== removed file 'mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc 1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-############## mysql-test\t\multi_range_count_basic.test ###############
-# #
-# Variable Name: multi_range_count #
-# Scope: GLOBAL | SESSION #
-# Access Type: Dynamic #
-# Data Type: numeric #
-# Default Value: 256 #
-# Range:1-4294967295 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Salman #
-# #
-# Description: Test Cases of Dynamic System Variable multi_range_count #
-# that checks the behavior of this variable in the following ways#
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/load_sysvars.inc
-
-#################################################################
-# START OF multi_range_count TESTS #
-#################################################################
-
-
-#############################################################
-# Save initial value #
-#############################################################
-
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-
-
---echo '#--------------------FN_DYNVARS_090_01-------------------------#'
-#################################################################
-# Display the DEFAULT value of multi_range_count #
-#################################################################
-
-SET @@global.multi_range_count = 100;
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count;
-
-SET @@session.multi_range_count = 200;
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count;
-
-
---echo '#--------------------FN_DYNVARS_090_02-------------------------#'
-#################################################################
-# Check the DEFAULT value of multi_range_count #
-#################################################################
-
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count = 256;
-
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count = 256;
-
-
---echo '#--------------------FN_DYNVARS_090_03-------------------------#'
-###########################################################################
-# Change the value of multi_range_count to a valid value for GLOBAL Scope #
-###########################################################################
-
-SET @@global.multi_range_count = 1;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 60020;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 65535;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 4294967295;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 4294967294;
-SELECT @@global.multi_range_count;
-
-
-
---echo '#--------------------FN_DYNVARS_090_04-------------------------#'
-############################################################################
-# Change the value of multi_range_count to a valid value for SESSION Scope #
-############################################################################
-
-SET @@session.multi_range_count = 1;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 50050;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 65535;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 4294967295;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 4294967294;
-SELECT @@session.multi_range_count;
-
-
---echo '#------------------FN_DYNVARS_090_05-----------------------#'
-#############################################################
-# Change the value of multi_range_count to an invalid value #
-#############################################################
-
-SET @@global.multi_range_count = 0;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 4294967296;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = -1024;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 429496729500;
-SELECT @@global.multi_range_count;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.multi_range_count = 65530.34;
-SELECT @@global.multi_range_count;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.multi_range_count = test;
-SELECT @@global.multi_range_count;
-
-SET @@session.multi_range_count = 0;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 4294967296;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = -1;
-SELECT @@session.multi_range_count;
---Error ER_PARSE_ERROR
-SET @@session.multi_range_count = 65530.34.;
-SET @@session.multi_range_count = 4294967295021;
-SELECT @@session.multi_range_count;
---echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.multi_range_count = test;
-SELECT @@session.multi_range_count;
-
-
---echo '#------------------FN_DYNVARS_090_06-----------------------#'
-####################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-####################################################################
-
-
-SELECT @@global.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-
---echo '#------------------FN_DYNVARS_090_07-----------------------#'
-####################################################################
-# Check if the value in SESSION Table matches value in variable #
-####################################################################
-
-SELECT @@session.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-
-
---echo '#------------------FN_DYNVARS_090_08-----------------------#'
-####################################################################
-# Check if TRUE and FALSE values can be used on variable #
-####################################################################
-
-SET @@global.multi_range_count = TRUE;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = FALSE;
-SELECT @@global.multi_range_count;
-
-
---echo '#---------------------FN_DYNVARS_090_09----------------------#'
-#################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-#################################################################################
-
-SET @@global.multi_range_count = 10;
-SELECT @@multi_range_count = @@global.multi_range_count;
-
-
---echo '#---------------------FN_DYNVARS_090_10----------------------#'
-########################################################################################################
-# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable #
-########################################################################################################
-
-SET @@multi_range_count = 100;
-SELECT @@multi_range_count = @@local.multi_range_count;
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-
-
---echo '#---------------------FN_DYNVARS_090_11----------------------#'
-############################################################################
-# Check if multi_range_count can be accessed with and without @@ sign #
-############################################################################
-
-SET multi_range_count = 1;
-SELECT @@multi_range_count;
---Error ER_UNKNOWN_TABLE
-SELECT local.multi_range_count;
---Error ER_UNKNOWN_TABLE
-SELECT session.multi_range_count;
---Error ER_BAD_FIELD_ERROR
-SELECT multi_range_count = @@session.multi_range_count;
-
-
-####################################
-# Restore initial value #
-####################################
-
-SET @@global.multi_range_count = @start_global_value;
-SELECT @@global.multi_range_count;
-SET @@session.multi_range_count = @start_session_value;
-SELECT @@session.multi_range_count;
-
-
-######################################################
-# END OF multi_range_count TESTS #
-######################################################
-
=== modified file 'mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc 2009-01-21 13:23:30 +0000
@@ -94,10 +94,10 @@ SET @@session.query_alloc_block_size = 1
SELECT @@session.query_alloc_block_size;
SET @@session.query_alloc_block_size = 1025;
SELECT @@session.query_alloc_block_size;
-SET @@session.query_alloc_block_size = 4294967295;
-SELECT @@session.query_alloc_block_size;
-SET @@session.query_alloc_block_size = 4294967294;
-SELECT @@session.query_alloc_block_size;
+#SET @@session.query_alloc_block_size = 4294967295;
+#SELECT @@session.query_alloc_block_size;
+#SET @@session.query_alloc_block_size = 4294967294;
+#SELECT @@session.query_alloc_block_size;
SET @@session.query_alloc_block_size = 655536;
SELECT @@session.query_alloc_block_size;
@@ -129,8 +129,8 @@ SELECT @@session.query_alloc_block_size;
SET @@session.query_alloc_block_size = 65530.34.;
SET @@session.query_alloc_block_size = 1023;
SELECT @@session.query_alloc_block_size;
-SET @@session.query_alloc_block_size = 4294967296;
-SELECT @@session.query_alloc_block_size;
+#SET @@session.query_alloc_block_size = 4294967296;
+#SELECT @@session.query_alloc_block_size;
--echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
--Error ER_WRONG_TYPE_FOR_VAR
=== modified file 'mysql-test/suite/sys_vars/inc/timestamp_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc 2008-12-19 14:11:02 +0000
@@ -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-------------------------#'
#############################################################################
=== renamed file 'mysql-test/r/auto_commit_basic.result' => 'mysql-test/suite/sys_vars/r/auto_commit_basic.result'
=== renamed file 'mysql-test/r/auto_increment_increment_basic.result' => 'mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result'
=== renamed file 'mysql-test/r/auto_increment_increment_func.result' => 'mysql-test/suite/sys_vars/r/auto_increment_increment_func.result'
=== renamed file 'mysql-test/r/auto_increment_offset_basic.result' => 'mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result'
=== renamed file 'mysql-test/r/auto_increment_offset_func.result' => 'mysql-test/suite/sys_vars/r/auto_increment_offset_func.result'
=== renamed file 'mysql-test/r/autocommit_func.result' => 'mysql-test/suite/sys_vars/r/autocommit_func.result'
=== renamed file 'mysql-test/r/automatic_sp_privileges_basic.result' => 'mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result'
=== renamed file 'mysql-test/r/automatic_sp_privileges_func.result' => 'mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result'
=== renamed file 'mysql-test/r/basedir_basic.result' => 'mysql-test/suite/sys_vars/r/basedir_basic.result'
=== renamed file 'mysql-test/r/big_tables_basic.result' => 'mysql-test/suite/sys_vars/r/big_tables_basic.result'
=== renamed file 'mysql-test/r/binlog_format_basic.result' => 'mysql-test/suite/sys_vars/r/binlog_format_basic.result'
=== renamed file 'mysql-test/r/character_set_client_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_client_basic.result'
=== renamed file 'mysql-test/r/character_set_client_func.result' => 'mysql-test/suite/sys_vars/r/character_set_client_func.result'
=== renamed file 'mysql-test/r/character_set_connection_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_connection_basic.result'
=== renamed file 'mysql-test/r/character_set_connection_func.result' => 'mysql-test/suite/sys_vars/r/character_set_connection_func.result'
=== renamed file 'mysql-test/r/character_set_database_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_database_basic.result'
=== renamed file 'mysql-test/r/character_set_database_func.result' => 'mysql-test/suite/sys_vars/r/character_set_database_func.result'
=== renamed file 'mysql-test/r/character_set_filesystem_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result'
=== renamed file 'mysql-test/r/character_set_results_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_results_basic.result'
=== renamed file 'mysql-test/r/character_set_results_func.result' => 'mysql-test/suite/sys_vars/r/character_set_results_func.result'
=== renamed file 'mysql-test/r/character_set_server_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_server_basic.result'
=== renamed file 'mysql-test/r/character_set_server_func.result' => 'mysql-test/suite/sys_vars/r/character_set_server_func.result'
=== renamed file 'mysql-test/r/character_set_system_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_system_basic.result'
=== renamed file 'mysql-test/r/collation_connection_basic.result' => 'mysql-test/suite/sys_vars/r/collation_connection_basic.result'
=== renamed file 'mysql-test/r/collation_connection_func.result' => 'mysql-test/suite/sys_vars/r/collation_connection_func.result'
=== renamed file 'mysql-test/r/collation_database_basic.result' => 'mysql-test/suite/sys_vars/r/collation_database_basic.result'
=== renamed file 'mysql-test/r/collation_database_func.result' => 'mysql-test/suite/sys_vars/r/collation_database_func.result'
=== renamed file 'mysql-test/r/collation_server_basic.result' => 'mysql-test/suite/sys_vars/r/collation_server_basic.result'
=== renamed file 'mysql-test/r/collation_server_func.result' => 'mysql-test/suite/sys_vars/r/collation_server_func.result'
=== renamed file 'mysql-test/r/completion_type_basic.result' => 'mysql-test/suite/sys_vars/r/completion_type_basic.result'
=== renamed file 'mysql-test/r/completion_type_func.result' => 'mysql-test/suite/sys_vars/r/completion_type_func.result'
=== renamed file 'mysql-test/r/concurrent_insert_basic.result' => 'mysql-test/suite/sys_vars/r/concurrent_insert_basic.result'
=== renamed file 'mysql-test/r/concurrent_insert_func.result' => 'mysql-test/suite/sys_vars/r/concurrent_insert_func.result'
=== renamed file 'mysql-test/r/connect_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/connect_timeout_basic.result'
=== renamed file 'mysql-test/r/datadir_basic.result' => 'mysql-test/suite/sys_vars/r/datadir_basic.result'
=== renamed file 'mysql-test/r/default_week_format_basic.result' => 'mysql-test/suite/sys_vars/r/default_week_format_basic.result'
=== renamed file 'mysql-test/r/default_week_format_func.result' => 'mysql-test/suite/sys_vars/r/default_week_format_func.result'
=== renamed file 'mysql-test/r/delay_key_write_basic.result' => 'mysql-test/suite/sys_vars/r/delay_key_write_basic.result'
=== renamed file 'mysql-test/r/delay_key_write_func.result' => 'mysql-test/suite/sys_vars/r/delay_key_write_func.result'
=== renamed file 'mysql-test/r/delayed_insert_limit_func.result' => 'mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result'
=== renamed file 'mysql-test/r/delayed_insert_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result'
=== renamed file 'mysql-test/r/div_precision_increment_basic.result' => 'mysql-test/suite/sys_vars/r/div_precision_increment_basic.result'
=== renamed file 'mysql-test/r/div_precision_increment_func.result' => 'mysql-test/suite/sys_vars/r/div_precision_increment_func.result'
=== renamed file 'mysql-test/r/engine_condition_pushdown_basic.result' => 'mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result'
=== renamed file 'mysql-test/r/error_count_basic.result' => 'mysql-test/suite/sys_vars/r/error_count_basic.result'
=== renamed file 'mysql-test/r/event_scheduler_basic.result' => 'mysql-test/suite/sys_vars/r/event_scheduler_basic.result'
=== renamed file 'mysql-test/r/event_scheduler_func.result' => 'mysql-test/suite/sys_vars/r/event_scheduler_func.result'
=== renamed file 'mysql-test/r/expire_logs_days_basic.result' => 'mysql-test/suite/sys_vars/r/expire_logs_days_basic.result'
=== renamed file 'mysql-test/r/flush_basic.result' => 'mysql-test/suite/sys_vars/r/flush_basic.result'
=== renamed file 'mysql-test/r/foreign_key_checks_basic.result' => 'mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result'
=== renamed file 'mysql-test/r/foreign_key_checks_func.result' => 'mysql-test/suite/sys_vars/r/foreign_key_checks_func.result'
=== renamed file 'mysql-test/r/ft_boolean_syntax_basic.result' => 'mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result'
=== renamed file 'mysql-test/r/ft_boolean_syntax_func.result' => 'mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result'
=== renamed file 'mysql-test/r/general_log_basic.result' => 'mysql-test/suite/sys_vars/r/general_log_basic.result'
=== renamed file 'mysql-test/r/general_log_file_basic.result' => 'mysql-test/suite/sys_vars/r/general_log_file_basic.result'
=== renamed file 'mysql-test/r/general_log_file_func.result' => 'mysql-test/suite/sys_vars/r/general_log_file_func.result'
=== renamed file 'mysql-test/r/general_log_func.result' => 'mysql-test/suite/sys_vars/r/general_log_func.result'
=== renamed file 'mysql-test/r/group_concat_max_len_basic.result' => 'mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result'
=== renamed file 'mysql-test/r/group_concat_max_len_func.result' => 'mysql-test/suite/sys_vars/r/group_concat_max_len_func.result'
=== renamed file 'mysql-test/r/have_compress_basic.result' => 'mysql-test/suite/sys_vars/r/have_compress_basic.result'
=== renamed file 'mysql-test/r/have_crypt_basic.result' => 'mysql-test/suite/sys_vars/r/have_crypt_basic.result'
=== renamed file 'mysql-test/r/have_csv_basic.result' => 'mysql-test/suite/sys_vars/r/have_csv_basic.result'
=== renamed file 'mysql-test/r/have_dynamic_loading_basic.result' => 'mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result'
=== renamed file 'mysql-test/r/have_geometry_basic.result' => 'mysql-test/suite/sys_vars/r/have_geometry_basic.result'
=== renamed file 'mysql-test/r/have_innodb_basic.result' => 'mysql-test/suite/sys_vars/r/have_innodb_basic.result'
=== renamed file 'mysql-test/r/have_ndbcluster_basic.result' => 'mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result'
=== renamed file 'mysql-test/r/have_openssl_basic.result' => 'mysql-test/suite/sys_vars/r/have_openssl_basic.result'
=== renamed file 'mysql-test/r/have_partitioning_basic.result' => 'mysql-test/suite/sys_vars/r/have_partitioning_basic.result'
=== renamed file 'mysql-test/r/have_query_cache_basic.result' => 'mysql-test/suite/sys_vars/r/have_query_cache_basic.result'
=== renamed file 'mysql-test/r/have_rtree_keys_basic.result' => 'mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result'
=== renamed file 'mysql-test/r/have_ssl_basic.result' => 'mysql-test/suite/sys_vars/r/have_ssl_basic.result'
=== renamed file 'mysql-test/r/have_symlink_basic.result' => 'mysql-test/suite/sys_vars/r/have_symlink_basic.result'
=== renamed file 'mysql-test/r/hostname_basic.result' => 'mysql-test/suite/sys_vars/r/hostname_basic.result'
=== renamed file 'mysql-test/r/identity_basic.result' => 'mysql-test/suite/sys_vars/r/identity_basic.result'
=== renamed file 'mysql-test/r/identity_func.result' => 'mysql-test/suite/sys_vars/r/identity_func.result'
=== renamed file 'mysql-test/r/init_connect_basic.result' => 'mysql-test/suite/sys_vars/r/init_connect_basic.result'
=== renamed file 'mysql-test/r/init_slave_basic.result' => 'mysql-test/suite/sys_vars/r/init_slave_basic.result'
=== renamed file 'mysql-test/r/innodb_additional_mem_pool_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result'
=== renamed file 'mysql-test/r/innodb_autoextend_increment_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result'
=== renamed file 'mysql-test/r/innodb_autoinc_lock_mode_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result'
=== renamed file 'mysql-test/r/innodb_autoinc_lock_mode_func.result' => 'mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result'
=== renamed file 'mysql-test/r/innodb_buffer_pool_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result'
=== renamed file 'mysql-test/r/innodb_checksums_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_checksums_basic.result'
=== renamed file 'mysql-test/r/innodb_commit_concurrency_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result'
=== renamed file 'mysql-test/r/innodb_data_file_path_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result'
=== renamed file 'mysql-test/r/innodb_data_home_dir_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result'
=== renamed file 'mysql-test/r/innodb_doublewrite_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result'
=== renamed file 'mysql-test/r/innodb_fast_shutdown_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result'
=== renamed file 'mysql-test/r/innodb_file_io_threads_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result'
=== renamed file 'mysql-test/r/innodb_file_per_table_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result'
=== renamed file 'mysql-test/r/innodb_flush_log_at_trx_commit_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result'
=== renamed file 'mysql-test/r/innodb_flush_method_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result'
=== renamed file 'mysql-test/r/innodb_force_recovery_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result'
=== renamed file 'mysql-test/r/innodb_lock_wait_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result'
=== renamed file 'mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result'
=== renamed file 'mysql-test/r/innodb_log_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result'
=== renamed file 'mysql-test/r/innodb_log_file_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result'
=== renamed file 'mysql-test/r/innodb_log_files_in_group_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result'
=== renamed file 'mysql-test/r/innodb_log_group_home_dir_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result'
=== renamed file 'mysql-test/r/innodb_max_dirty_pages_pct_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result'
=== renamed file 'mysql-test/r/innodb_max_dirty_pages_pct_func.result' => 'mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result'
=== renamed file 'mysql-test/r/innodb_mirrored_log_groups_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result'
=== renamed file 'mysql-test/r/innodb_open_files_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_open_files_basic.result'
=== renamed file 'mysql-test/r/innodb_rollback_on_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result'
=== renamed file 'mysql-test/r/innodb_support_xa_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result'
=== renamed file 'mysql-test/r/innodb_support_xa_func.result' => 'mysql-test/suite/sys_vars/r/innodb_support_xa_func.result'
=== renamed file 'mysql-test/r/innodb_table_locks_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result'
=== renamed file 'mysql-test/r/innodb_table_locks_func.result' => 'mysql-test/suite/sys_vars/r/innodb_table_locks_func.result'
=== renamed file 'mysql-test/r/innodb_thread_concurrency_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result'
=== renamed file 'mysql-test/r/innodb_thread_sleep_delay_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result'
=== renamed file 'mysql-test/r/insert_id_basic.result' => 'mysql-test/suite/sys_vars/r/insert_id_basic.result'
=== renamed file 'mysql-test/r/insert_id_func.result' => 'mysql-test/suite/sys_vars/r/insert_id_func.result'
=== renamed file 'mysql-test/r/interactive_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/interactive_timeout_basic.result'
=== renamed file 'mysql-test/r/interactive_timeout_func.result' => 'mysql-test/suite/sys_vars/r/interactive_timeout_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -8,15 +8,11 @@ SELECT @start_session_value;
131072
'#--------------------FN_DYNVARS_053_01-------------------------#'
SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
SET @@global.join_buffer_size = DEFAULT;
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
131072
SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
SET @@session.join_buffer_size = DEFAULT;
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
@@ -32,106 +28,108 @@ SELECT @@session.join_buffer_size = 1310
1
'#--------------------FN_DYNVARS_053_03-------------------------#'
SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
-SET @@global.join_buffer_size = 65536;
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-65536
+8192
+SELECT @@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228
+1
+SET @@global.join_buffer_size = 65536;
SET @@global.join_buffer_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect join_buffer_size value: '4294967295'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-4294963200
+4294967168
'Bug # 34837: Errors are not coming on assigning invalid values to variable'
'#--------------------FN_DYNVARS_053_04-------------------------#'
SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = 65536;
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
65536
SET @@session.join_buffer_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect join_buffer_size value: '4294967295'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-4294963200
+4294967168
'Bug # 34837: Errors are not coming on assigning invalid values to variable'
'#------------------FN_DYNVARS_053_05-----------------------#'
SET @@global.join_buffer_size = 0;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+164
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = -1024;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+164
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = 8199;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8199'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = 42949672951;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '42949672951'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-4294963200
+4294967168
SET @@global.join_buffer_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-4294963200
+4294967168
SET @@global.join_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-4294963200
+4294967168
SET @@session.join_buffer_size = 0;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = -2;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = 8199;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8199'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = 42949672951;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '42949672951'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-4294963200
+4294967168
SET @@session.join_buffer_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-4294963200
+4294967168
'Bug # 34837: Errors are not coming on assigning invalid values to variable'
SET @@session.join_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-4294963200
+4294967168
'#------------------FN_DYNVARS_053_06-----------------------#'
SELECT @@global.join_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -148,14 +146,14 @@ WHERE VARIABLE_NAME='join_buffer_size';
SET @@global.join_buffer_size = TRUE;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '1'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = FALSE;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
'#---------------------FN_DYNVARS_001_09----------------------#'
@@ -179,8 +177,8 @@ SELECT @@local.join_buffer_size = @@sess
SET join_buffer_size = 1;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
-@@join_buffer_size=8200 OR @@join_buffer_size= 8228
+SELECT @@join_buffer_size=164 OR @@join_buffer_size= 8228;
+@@join_buffer_size=164 OR @@join_buffer_size= 8228
1
SELECT local.join_buffer_size;
ERROR 42S02: Unknown table 'local' in field list
=== modified file 'mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result 2008-12-19 14:11:02 +0000
@@ -8,15 +8,11 @@ SELECT @start_session_value;
131072
'#--------------------FN_DYNVARS_053_01-------------------------#'
SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
SET @@global.join_buffer_size = DEFAULT;
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
131072
SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
SET @@session.join_buffer_size = DEFAULT;
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
@@ -32,26 +28,22 @@ SELECT @@session.join_buffer_size = 1310
1
'#--------------------FN_DYNVARS_053_03-------------------------#'
SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
-SET @@global.join_buffer_size = 65536;
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-65536
+8192
+SELECT @@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228
+1
+SET @@global.join_buffer_size = 65536;
SET @@global.join_buffer_size = 4294967295;
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-4294963200
+4294967168
'Bug # 34837: Errors are not coming on assigning invalid values to variable'
'#--------------------FN_DYNVARS_053_04-------------------------#'
SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = 65536;
SELECT @@session.join_buffer_size;
@@ -60,74 +52,76 @@ SELECT @@session.join_buffer_size;
SET @@session.join_buffer_size = 4294967295;
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-4294963200
+4294967168
'Bug # 34837: Errors are not coming on assigning invalid values to variable'
'#------------------FN_DYNVARS_053_05-----------------------#'
SET @@global.join_buffer_size = 0;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+164
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = -1024;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+164
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = 8199;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8199'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=8192 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = 42949672951;
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-42949668864
+42949672832
SET @@global.join_buffer_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-42949668864
+42949672832
SET @@global.join_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
-42949668864
+42949672832
SET @@session.join_buffer_size = 0;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = -2;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = 8199;
-Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '8199'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228;
+@@session.join_buffer_size=8192 OR @@session.join_buffer_size= 8228
1
SET @@session.join_buffer_size = 42949672951;
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-42949668864
+42949672832
SET @@session.join_buffer_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-42949668864
+42949672832
'Bug # 34837: Errors are not coming on assigning invalid values to variable'
SET @@session.join_buffer_size = test;
ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
-42949668864
+42949672832
'#------------------FN_DYNVARS_053_06-----------------------#'
SELECT @@global.join_buffer_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -144,14 +138,14 @@ WHERE VARIABLE_NAME='join_buffer_size';
SET @@global.join_buffer_size = TRUE;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '1'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
SET @@global.join_buffer_size = FALSE;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228;
+@@global.join_buffer_size=164 OR @@global.join_buffer_size= 8228
1
'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
'#---------------------FN_DYNVARS_001_09----------------------#'
@@ -175,8 +169,8 @@ SELECT @@local.join_buffer_size = @@sess
SET join_buffer_size = 1;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
-@@join_buffer_size=8200 OR @@join_buffer_size= 8228
+SELECT @@join_buffer_size=164 OR @@join_buffer_size= 8228;
+@@join_buffer_size=164 OR @@join_buffer_size= 8228
1
SELECT local.join_buffer_size;
ERROR 42S02: Unknown table 'local' in field list
=== renamed file 'mysql-test/r/keep_files_on_create_basic.result' => 'mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result'
=== renamed file 'mysql-test/r/key_buffer_size_func.result' => 'mysql-test/suite/sys_vars/r/key_buffer_size_func.result'
=== renamed file 'mysql-test/r/last_insert_id_func.result' => 'mysql-test/suite/sys_vars/r/last_insert_id_func.result'
=== renamed file 'mysql-test/r/lc_time_names_basic.result' => 'mysql-test/suite/sys_vars/r/lc_time_names_basic.result'
=== renamed file 'mysql-test/r/lc_time_names_func.result' => 'mysql-test/suite/sys_vars/r/lc_time_names_func.result'
=== renamed file 'mysql-test/r/license_basic.result' => 'mysql-test/suite/sys_vars/r/license_basic.result'
=== renamed file 'mysql-test/r/local_infile_basic.result' => 'mysql-test/suite/sys_vars/r/local_infile_basic.result'
=== renamed file 'mysql-test/r/local_infile_func.result' => 'mysql-test/suite/sys_vars/r/local_infile_func.result'
=== renamed file 'mysql-test/r/log_basic.result' => 'mysql-test/suite/sys_vars/r/log_basic.result'
=== renamed file 'mysql-test/r/log_bin_trust_function_creators_basic.result' => 'mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result'
=== renamed file 'mysql-test/r/log_bin_trust_function_creators_func.result' => 'mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result'
=== renamed file 'mysql-test/r/log_output_basic.result' => 'mysql-test/suite/sys_vars/r/log_output_basic.result'
=== renamed file 'mysql-test/r/log_output_func.result' => 'mysql-test/suite/sys_vars/r/log_output_func.result'
=== renamed file 'mysql-test/r/log_queries_not_using_indexes_basic.result' => 'mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/log_warnings_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result 2009-01-21 13:23:30 +0000
@@ -71,7 +71,7 @@ SELECT @@session.log_warnings;
'#------------------FN_DYNVARS_067_05-----------------------#'
SET @@global.log_warnings = 100000000000;
Warnings:
-Warning 1292 Truncated incorrect log-warnings value: '100000000000'
+Warning 1292 Truncated incorrect log_warnings value: '100000000000'
SELECT @@global.log_warnings;
@@global.log_warnings
4294967295
@@ -91,7 +91,7 @@ SELECT @@global.log_warnings;
0
SET @@session.log_warnings = 100000000000;
Warnings:
-Warning 1292 Truncated incorrect log-warnings value: '100000000000'
+Warning 1292 Truncated incorrect log_warnings value: '100000000000'
SELECT @@session.log_warnings;
@@session.log_warnings
4294967295
=== renamed file 'mysql-test/r/long_query_time_basic.result' => 'mysql-test/suite/sys_vars/r/long_query_time_basic.result'
=== renamed file 'mysql-test/r/low_priority_updates_basic.result' => 'mysql-test/suite/sys_vars/r/low_priority_updates_basic.result'
=== renamed file 'mysql-test/r/max_allowed_packet_basic.result' => 'mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result'
=== renamed file 'mysql-test/r/max_allowed_packet_func.result' => 'mysql-test/suite/sys_vars/r/max_allowed_packet_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -1,7 +1,7 @@
SET @start_value = @@global.max_binlog_cache_size;
SELECT @start_value;
@start_value
-4294967295
+4294963200
'#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_cache_size = 5000;
SET @@global.max_binlog_cache_size = DEFAULT;
=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result 2008-12-19 14:11:02 +0000
@@ -1,7 +1,7 @@
SET @start_value = @@global.max_binlog_cache_size;
SELECT @start_value;
@start_value
-18446744073709551615
+18446744073709547520
'#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_cache_size = 5000;
SET @@global.max_binlog_cache_size = DEFAULT;
=== renamed file 'mysql-test/r/max_binlog_cache_size_func.result' => 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result'
=== renamed file 'mysql-test/r/max_binlog_size_basic.result' => 'mysql-test/suite/sys_vars/r/max_binlog_size_basic.result'
=== renamed file 'mysql-test/r/max_connections_basic.result' => 'mysql-test/suite/sys_vars/r/max_connections_basic.result'
=== renamed file 'mysql-test/r/max_delayed_threads_basic.result' => 'mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result'
=== renamed file 'mysql-test/r/max_error_count_basic.result' => 'mysql-test/suite/sys_vars/r/max_error_count_basic.result'
=== renamed file 'mysql-test/r/max_insert_delayed_threads_basic.result' => 'mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result'
=== renamed file 'mysql-test/r/max_join_size_func.result' => 'mysql-test/suite/sys_vars/r/max_join_size_func.result'
=== renamed file 'mysql-test/r/max_length_for_sort_data_basic.result' => 'mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result'
=== renamed file 'mysql-test/r/max_prepared_stmt_count_basic.result' => 'mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result'
=== renamed file 'mysql-test/r/max_prepared_stmt_count_func.result' => 'mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result'
=== renamed file 'mysql-test/r/max_relay_log_size_basic.result' => 'mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result'
=== renamed file 'mysql-test/r/max_seeks_for_key_func.result' => 'mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result'
=== renamed file 'mysql-test/r/max_sort_length_basic.result' => 'mysql-test/suite/sys_vars/r/max_sort_length_basic.result'
=== renamed file 'mysql-test/r/max_sort_length_func.result' => 'mysql-test/suite/sys_vars/r/max_sort_length_func.result'
=== renamed file 'mysql-test/r/max_sp_recursion_depth_basic.result' => 'mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result'
=== renamed file 'mysql-test/r/max_sp_recursion_depth_func.result' => 'mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result'
=== renamed file 'mysql-test/r/max_user_connections_basic.result' => 'mysql-test/suite/sys_vars/r/max_user_connections_basic.result'
=== renamed file 'mysql-test/r/max_user_connections_func.result' => 'mysql-test/suite/sys_vars/r/max_user_connections_func.result'
=== removed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result 1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-@start_global_value
-256
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-@start_session_value
-256
-'#--------------------FN_DYNVARS_090_01-------------------------#'
-SET @@global.multi_range_count = 100;
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = 200;
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
-'#--------------------FN_DYNVARS_090_02-------------------------#'
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count = 256;
-@@global.multi_range_count = 256
-1
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count = 256;
-@@session.multi_range_count = 256
-1
-'#--------------------FN_DYNVARS_090_03-------------------------#'
-SET @@global.multi_range_count = 1;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 60020;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-60020
-SET @@global.multi_range_count = 65535;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-65535
-SET @@global.multi_range_count = 4294967295;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 4294967294;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967294
-'#--------------------FN_DYNVARS_090_04-------------------------#'
-SET @@session.multi_range_count = 1;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 50050;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-50050
-SET @@session.multi_range_count = 65535;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-65535
-SET @@session.multi_range_count = 4294967295;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = 4294967294;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967294
-'#------------------FN_DYNVARS_090_05-----------------------#'
-SET @@global.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '4294967296'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = -1024;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 429496729500;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '429496729500'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@session.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '4294967296'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = -1;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
-SET @@session.multi_range_count = 4294967295021;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '4294967295021'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@session.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-'#------------------FN_DYNVARS_090_06-----------------------#'
-SELECT @@global.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@global.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_07-----------------------#'
-SELECT @@session.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@session.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_08-----------------------#'
-SET @@global.multi_range_count = TRUE;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_09----------------------#'
-SET @@global.multi_range_count = 10;
-SELECT @@multi_range_count = @@global.multi_range_count;
-@@multi_range_count = @@global.multi_range_count
-0
-'#---------------------FN_DYNVARS_090_10----------------------#'
-SET @@multi_range_count = 100;
-SELECT @@multi_range_count = @@local.multi_range_count;
-@@multi_range_count = @@local.multi_range_count
-1
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-@@local.multi_range_count = @@session.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_11----------------------#'
-SET multi_range_count = 1;
-SELECT @@multi_range_count;
-@@multi_range_count
-1
-SELECT local.multi_range_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.multi_range_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT multi_range_count = @@session.multi_range_count;
-ERROR 42S22: Unknown column 'multi_range_count' in 'field list'
-SET @@global.multi_range_count = @start_global_value;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = @start_session_value;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
=== removed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-@start_global_value
-256
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-@start_session_value
-256
-'#--------------------FN_DYNVARS_090_01-------------------------#'
-SET @@global.multi_range_count = 100;
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = 200;
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
-'#--------------------FN_DYNVARS_090_02-------------------------#'
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count = 256;
-@@global.multi_range_count = 256
-1
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count = 256;
-@@session.multi_range_count = 256
-1
-'#--------------------FN_DYNVARS_090_03-------------------------#'
-SET @@global.multi_range_count = 1;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 60020;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-60020
-SET @@global.multi_range_count = 65535;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-65535
-SET @@global.multi_range_count = 4294967295;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 4294967294;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967294
-'#--------------------FN_DYNVARS_090_04-------------------------#'
-SET @@session.multi_range_count = 1;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 50050;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-50050
-SET @@session.multi_range_count = 65535;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-65535
-SET @@session.multi_range_count = 4294967295;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = 4294967294;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967294
-'#------------------FN_DYNVARS_090_05-----------------------#'
-SET @@global.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 4294967296;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967296
-SET @@global.multi_range_count = -1024;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 429496729500;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-429496729500
-SET @@global.multi_range_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-429496729500
-SET @@global.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-429496729500
-SET @@session.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 4294967296;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967296
-SET @@session.multi_range_count = -1;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
-SET @@session.multi_range_count = 4294967295021;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295021
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@session.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295021
-'#------------------FN_DYNVARS_090_06-----------------------#'
-SELECT @@global.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@global.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_07-----------------------#'
-SELECT @@session.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@session.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_08-----------------------#'
-SET @@global.multi_range_count = TRUE;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_09----------------------#'
-SET @@global.multi_range_count = 10;
-SELECT @@multi_range_count = @@global.multi_range_count;
-@@multi_range_count = @@global.multi_range_count
-0
-'#---------------------FN_DYNVARS_090_10----------------------#'
-SET @@multi_range_count = 100;
-SELECT @@multi_range_count = @@local.multi_range_count;
-@@multi_range_count = @@local.multi_range_count
-1
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-@@local.multi_range_count = @@session.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_11----------------------#'
-SET multi_range_count = 1;
-SELECT @@multi_range_count;
-@@multi_range_count
-1
-SELECT local.multi_range_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.multi_range_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT multi_range_count = @@session.multi_range_count;
-ERROR 42S22: Unknown column 'multi_range_count' in 'field list'
-SET @@global.multi_range_count = @start_global_value;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = @start_session_value;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
=== renamed file 'mysql-test/r/myisam_data_pointer_size_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result'
=== renamed file 'mysql-test/r/myisam_data_pointer_size_func.result' => 'mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -1,7 +1,7 @@
SET @start_global_value = @@global.myisam_max_sort_file_size;
SELECT @start_global_value;
@start_global_value
-2147483647
+2146435072
'#--------------------FN_DYNVARS_094_01-------------------------#'
SET @@global.myisam_max_sort_file_size = 500000;
SET @@global.myisam_max_sort_file_size = DEFAULT;
=== modified file 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result 2008-12-19 14:11:02 +0000
@@ -1,7 +1,7 @@
SET @start_global_value = @@global.myisam_max_sort_file_size;
SELECT @start_global_value;
@start_global_value
-9223372036854775807
+9223372036853727232
'#--------------------FN_DYNVARS_094_01-------------------------#'
SET @@global.myisam_max_sort_file_size = 500000;
SET @@global.myisam_max_sort_file_size = DEFAULT;
=== renamed file 'mysql-test/r/myisam_sort_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result'
=== renamed file 'mysql-test/r/myisam_stats_method_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result'
=== renamed file 'mysql-test/r/myisam_stats_method_func.result' => 'mysql-test/suite/sys_vars/r/myisam_stats_method_func.result'
=== renamed file 'mysql-test/r/myisam_use_mmap_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result'
=== renamed file 'mysql-test/r/ndb_log_update_as_write_basic.result' => 'mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result'
=== renamed file 'mysql-test/r/ndb_log_updated_only_basic.result' => 'mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result'
=== renamed file 'mysql-test/r/net_buffer_length_basic.result' => 'mysql-test/suite/sys_vars/r/net_buffer_length_basic.result'
=== renamed file 'mysql-test/r/net_read_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/net_read_timeout_basic.result'
=== renamed file 'mysql-test/r/net_write_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/net_write_timeout_basic.result'
=== renamed file 'mysql-test/r/new_basic.result' => 'mysql-test/suite/sys_vars/r/new_basic.result'
=== renamed file 'mysql-test/r/old_passwords_basic.result' => 'mysql-test/suite/sys_vars/r/old_passwords_basic.result'
=== renamed file 'mysql-test/r/old_passwords_func.result' => 'mysql-test/suite/sys_vars/r/old_passwords_func.result'
=== renamed file 'mysql-test/r/optimizer_prune_level_basic.result' => 'mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result'
=== renamed file 'mysql-test/r/optimizer_search_depth_basic.result' => 'mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result'
=== renamed file 'mysql-test/r/preload_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result 2009-01-21 13:23:30 +0000
@@ -36,10 +36,14 @@ SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
1024
SET @@global.query_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
SET @@global.query_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
@@ -57,14 +61,6 @@ SET @@session.query_alloc_block_size = 1
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
-SET @@session.query_alloc_block_size = 4294967295;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-4294966272
-SET @@session.query_alloc_block_size = 4294967294;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-4294966272
SET @@session.query_alloc_block_size = 655536;
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
@@ -124,18 +120,12 @@ Warning 1292 Truncated incorrect query_a
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
-SET @@session.query_alloc_block_size = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967296'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-4294966272
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@session.query_alloc_block_size = test;
ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
-4294966272
+1024
'#------------------FN_DYNVARS_130_06-----------------------#'
'Bug# 34877: OutOFMemeory errors are coming if we dont assign these values to variable before comparision statement';
SET @@global.query_alloc_block_size = 1;
=== renamed file 'mysql-test/r/query_cache_limit_func.result' => 'mysql-test/suite/sys_vars/r/query_cache_limit_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -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
SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
@@global.query_cache_size
-0
+131072
=== renamed file 'mysql-test/r/query_cache_type_basic.result' => 'mysql-test/suite/sys_vars/r/query_cache_type_basic.result'
=== renamed file 'mysql-test/r/query_cache_type_func.result' => 'mysql-test/suite/sys_vars/r/query_cache_type_func.result'
=== renamed file 'mysql-test/r/query_cache_wlock_invalidate_basic.result' => 'mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result'
=== renamed file 'mysql-test/r/query_cache_wlock_invalidate_func.result' => 'mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -36,6 +36,8 @@ SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
SET @@global.query_prealloc_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect query_prealloc_size value: '4294967295'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
4294966272
@@ -49,6 +51,8 @@ SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
8192
SET @@session.query_prealloc_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect query_prealloc_size value: '4294967295'
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
4294966272
=== renamed file 'mysql-test/r/query_prealloc_size_func.result' => 'mysql-test/suite/sys_vars/r/query_prealloc_size_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -39,10 +39,14 @@ SELECT @@global.range_alloc_block_size;
4096
'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
SET @@global.range_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967295'
SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size
4294966272
SET @@global.range_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967294'
SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size
4294966272
@@ -55,10 +59,14 @@ SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4096
SET @@session.range_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967295'
SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4294966272
SET @@session.range_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967294'
SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4294966272
=== renamed file 'mysql-test/r/read_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/read_buffer_size_basic.result'
=== renamed file 'mysql-test/r/read_only_basic.result' => 'mysql-test/suite/sys_vars/r/read_only_basic.result'
=== renamed file 'mysql-test/r/read_only_func.result' => 'mysql-test/suite/sys_vars/r/read_only_func.result'
=== renamed file 'mysql-test/r/read_rnd_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result'
=== renamed file 'mysql-test/r/relay_log_purge_basic.result' => 'mysql-test/suite/sys_vars/r/relay_log_purge_basic.result'
=== renamed file 'mysql-test/r/rpl_init_slave_func.result' => 'mysql-test/suite/sys_vars/r/rpl_init_slave_func.result'
=== renamed file 'mysql-test/r/rpl_max_binlog_size_func.result' => 'mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result'
--- a/mysql-test/r/rpl_max_binlog_size_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result 2008-12-12 20:48:17 +0000
@@ -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;
=== renamed file 'mysql-test/r/rpl_slave_allow_batching_basic.result' => 'mysql-test/suite/sys_vars/r/rpl_slave_allow_batching_basic.result'
=== renamed file 'mysql-test/r/rpl_slave_compressed_protocol_basic.result' => 'mysql-test/suite/sys_vars/r/rpl_slave_compressed_protocol_basic.result'
=== renamed file 'mysql-test/r/rpl_slave_exec_mode_basic.result' => 'mysql-test/suite/sys_vars/r/rpl_slave_exec_mode_basic.result'
=== renamed file 'mysql-test/r/rpl_slave_net_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/rpl_slave_net_timeout_basic.result'
=== renamed file 'mysql-test/r/secure_auth_basic.result' => 'mysql-test/suite/sys_vars/r/secure_auth_basic.result'
=== renamed file 'mysql-test/r/secure_auth_func.result' => 'mysql-test/suite/sys_vars/r/secure_auth_func.result'
=== renamed file 'mysql-test/r/slave_allow_batching_basic.result' => 'mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result'
=== renamed file 'mysql-test/r/slave_compressed_protocol_basic.result' => 'mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result'
=== renamed file 'mysql-test/r/slave_net_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result'
=== renamed file 'mysql-test/r/slow_launch_time_basic.result' => 'mysql-test/suite/sys_vars/r/slow_launch_time_basic.result'
=== renamed file 'mysql-test/r/slow_launch_time_func.result' => 'mysql-test/suite/sys_vars/r/slow_launch_time_func.result'
=== renamed file 'mysql-test/r/slow_query_log_basic.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_basic.result'
=== renamed file 'mysql-test/r/slow_query_log_file_basic.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result'
=== renamed file 'mysql-test/r/slow_query_log_file_func.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_file_func.result'
=== renamed file 'mysql-test/r/slow_query_log_func.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_func.result'
=== renamed file 'mysql-test/r/sql_auto_is_null_basic.result' => 'mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result'
=== renamed file 'mysql-test/r/sql_big_selects_basic.result' => 'mysql-test/suite/sys_vars/r/sql_big_selects_basic.result'
=== renamed file 'mysql-test/r/sql_big_selects_func.result' => 'mysql-test/suite/sys_vars/r/sql_big_selects_func.result'
=== renamed file 'mysql-test/r/sql_big_tables_basic.result' => 'mysql-test/suite/sys_vars/r/sql_big_tables_basic.result'
=== renamed file 'mysql-test/r/sql_big_tables_func.result' => 'mysql-test/suite/sys_vars/r/sql_big_tables_func.result'
=== renamed file 'mysql-test/r/sql_buffer_result_basic.result' => 'mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result'
=== renamed file 'mysql-test/r/sql_buffer_result_func.result' => 'mysql-test/suite/sys_vars/r/sql_buffer_result_func.result'
=== renamed file 'mysql-test/r/sql_log_bin_basic.result' => 'mysql-test/suite/sys_vars/r/sql_log_bin_basic.result'
=== renamed file 'mysql-test/r/sql_log_off_basic.result' => 'mysql-test/suite/sys_vars/r/sql_log_off_basic.result'
=== renamed file 'mysql-test/r/sql_log_off_func.result' => 'mysql-test/suite/sys_vars/r/sql_log_off_func.result'
=== renamed file 'mysql-test/r/sql_low_priority_updates_basic.result' => 'mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result'
=== renamed file 'mysql-test/r/sql_low_priority_updates_func.result' => 'mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result'
=== renamed file 'mysql-test/r/sql_max_join_size_func.result' => 'mysql-test/suite/sys_vars/r/sql_max_join_size_func.result'
=== renamed file 'mysql-test/r/sql_mode_basic.result' => 'mysql-test/suite/sys_vars/r/sql_mode_basic.result'
=== renamed file 'mysql-test/r/sql_mode_func.result' => 'mysql-test/suite/sys_vars/r/sql_mode_func.result'
=== renamed file 'mysql-test/r/sql_notes_basic.result' => 'mysql-test/suite/sys_vars/r/sql_notes_basic.result'
=== renamed file 'mysql-test/r/sql_notes_func.result' => 'mysql-test/suite/sys_vars/r/sql_notes_func.result'
=== renamed file 'mysql-test/r/sql_quote_show_create_basic.result' => 'mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result'
=== renamed file 'mysql-test/r/sql_quote_show_create_func.result' => 'mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result'
=== renamed file 'mysql-test/r/sql_safe_updates_basic.result' => 'mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result'
=== renamed file 'mysql-test/r/sql_safe_updates_func.result' => 'mysql-test/suite/sys_vars/r/sql_safe_updates_func.result'
=== renamed file 'mysql-test/r/sql_select_limit_func.result' => 'mysql-test/suite/sys_vars/r/sql_select_limit_func.result'
=== renamed file 'mysql-test/r/sql_slave_skip_counter_basic.result' => 'mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result'
=== renamed file 'mysql-test/r/sql_warnings_basic.result' => 'mysql-test/suite/sys_vars/r/sql_warnings_basic.result'
=== renamed file 'mysql-test/r/sql_warnings_func.result' => 'mysql-test/suite/sys_vars/r/sql_warnings_func.result'
=== renamed file 'mysql-test/r/ssl_ca_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_ca_basic.result'
=== renamed file 'mysql-test/r/ssl_capath_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_capath_basic.result'
=== renamed file 'mysql-test/r/ssl_cert_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_cert_basic.result'
=== renamed file 'mysql-test/r/ssl_cipher_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_cipher_basic.result'
=== renamed file 'mysql-test/r/ssl_key_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_key_basic.result'
=== renamed file 'mysql-test/r/storage_engine_basic.result' => 'mysql-test/suite/sys_vars/r/storage_engine_basic.result'
=== renamed file 'mysql-test/r/sync_frm_basic.result' => 'mysql-test/suite/sys_vars/r/sync_frm_basic.result'
=== renamed file 'mysql-test/r/system_time_zone_basic.result' => 'mysql-test/suite/sys_vars/r/system_time_zone_basic.result'
=== renamed file 'mysql-test/r/table_definition_cache_basic.result' => 'mysql-test/suite/sys_vars/r/table_definition_cache_basic.result'
=== renamed file 'mysql-test/r/table_lock_wait_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result'
=== renamed file 'mysql-test/r/table_open_cache_basic.result' => 'mysql-test/suite/sys_vars/r/table_open_cache_basic.result'
=== renamed file 'mysql-test/r/thread_cache_size_func.result' => 'mysql-test/suite/sys_vars/r/thread_cache_size_func.result'
=== renamed file 'mysql-test/r/thread_handling_basic.result' => 'mysql-test/suite/sys_vars/r/thread_handling_basic.result'
=== renamed file 'mysql-test/r/time_zone_basic.result' => 'mysql-test/suite/sys_vars/r/time_zone_basic.result'
=== renamed file 'mysql-test/r/time_zone_func.result' => 'mysql-test/suite/sys_vars/r/time_zone_func.result'
=== renamed file 'mysql-test/r/timed_mutexes_basic.result' => 'mysql-test/suite/sys_vars/r/timed_mutexes_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/timestamp_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/timestamp_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result 2008-12-19 14:11:02 +0000
@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to
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'
=== modified file 'mysql-test/suite/sys_vars/r/timestamp_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/timestamp_basic_64.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result 2008-12-19 14:11:02 +0000
@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to
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'
=== renamed file 'mysql-test/r/timestamp_func.result' => 'mysql-test/suite/sys_vars/r/timestamp_func.result'
=== renamed file 'mysql-test/r/timestamp_sysdate_is_now_func.result' => 'mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result'
=== renamed file 'mysql-test/r/tmpdir_basic.result' => 'mysql-test/suite/sys_vars/r/tmpdir_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result 2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result 2008-12-19 14:11:02 +0000
@@ -40,6 +40,8 @@ SELECT @@global.transaction_alloc_block_
@@global.transaction_alloc_block_size
59392
SET @@global.transaction_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size
4294966272
@@ -50,6 +52,8 @@ SELECT @@session.transaction_alloc_block
@@session.transaction_alloc_block_size
1024
SET @@session.transaction_alloc_block_size =4294967295;
+Warnings:
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@session.transaction_alloc_block_size;
@@session.transaction_alloc_block_size
4294966272
@@ -146,6 +150,8 @@ WHERE VARIABLE_NAME='transaction_alloc_b
'#---------------------FN_DYNVARS_001_08----------------------#'
SET @@transaction_alloc_block_size = 1024;
SET @@global.transaction_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
0
=== renamed file 'mysql-test/r/tx_isolation_basic.result' => 'mysql-test/suite/sys_vars/r/tx_isolation_basic.result'
=== renamed file 'mysql-test/r/tx_isolation_func.result' => 'mysql-test/suite/sys_vars/r/tx_isolation_func.result'
=== renamed file 'mysql-test/r/unique_checks_basic.result' => 'mysql-test/suite/sys_vars/r/unique_checks_basic.result'
=== renamed file 'mysql-test/r/updatable_views_with_limit_basic.result' => 'mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result'
=== renamed file 'mysql-test/r/updatable_views_with_limit_func.result' => 'mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result'
=== renamed file 'mysql-test/r/version_basic.result' => 'mysql-test/suite/sys_vars/r/version_basic.result'
=== renamed file 'mysql-test/r/version_comment_basic.result' => 'mysql-test/suite/sys_vars/r/version_comment_basic.result'
=== renamed file 'mysql-test/r/version_compile_machine_basic.result' => 'mysql-test/suite/sys_vars/r/version_compile_machine_basic.result'
=== renamed file 'mysql-test/r/version_compile_os_basic.result' => 'mysql-test/suite/sys_vars/r/version_compile_os_basic.result'
=== renamed file 'mysql-test/r/wait_timeout_func.result' => 'mysql-test/suite/sys_vars/r/wait_timeout_func.result'
=== renamed file 'mysql-test/r/warning_count_basic.result' => 'mysql-test/suite/sys_vars/r/warning_count_basic.result'
=== renamed file 'mysql-test/t/auto_commit_basic.test' => 'mysql-test/suite/sys_vars/t/auto_commit_basic.test'
=== renamed file 'mysql-test/t/auto_increment_increment_basic.test' => 'mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test'
=== renamed file 'mysql-test/t/auto_increment_increment_func.test' => 'mysql-test/suite/sys_vars/t/auto_increment_increment_func.test'
=== renamed file 'mysql-test/t/auto_increment_offset_basic.test' => 'mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test'
=== renamed file 'mysql-test/t/auto_increment_offset_func.test' => 'mysql-test/suite/sys_vars/t/auto_increment_offset_func.test'
=== renamed file 'mysql-test/t/autocommit_func-master.opt' => 'mysql-test/suite/sys_vars/t/autocommit_func-master.opt'
=== renamed file 'mysql-test/t/autocommit_func.test' => 'mysql-test/suite/sys_vars/t/autocommit_func.test'
=== renamed file 'mysql-test/t/automatic_sp_privileges_basic.test' => 'mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test'
=== renamed file 'mysql-test/t/automatic_sp_privileges_func.test' => 'mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test'
=== renamed file 'mysql-test/t/basedir_basic.test' => 'mysql-test/suite/sys_vars/t/basedir_basic.test'
=== renamed file 'mysql-test/t/big_tables_basic.test' => 'mysql-test/suite/sys_vars/t/big_tables_basic.test'
=== renamed file 'mysql-test/t/binlog_format_basic.test' => 'mysql-test/suite/sys_vars/t/binlog_format_basic.test'
=== renamed file 'mysql-test/t/character_set_client_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_client_basic.test'
--- a/mysql-test/t/character_set_client_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_client_basic.test 2008-12-12 20:48:17 +0000
@@ -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-------------------------#'
################################################################################
=== renamed file 'mysql-test/t/character_set_client_func.test' => 'mysql-test/suite/sys_vars/t/character_set_client_func.test'
=== renamed file 'mysql-test/t/character_set_connection_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_connection_basic.test'
--- a/mysql-test/t/character_set_connection_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test 2008-12-12 20:48:17 +0000
@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 +
##############################################################################
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.charact
##############################################################################
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-------------------------#'
=== renamed file 'mysql-test/t/character_set_connection_func.test' => 'mysql-test/suite/sys_vars/t/character_set_connection_func.test'
=== renamed file 'mysql-test/t/character_set_database_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_database_basic.test'
--- a/mysql-test/t/character_set_database_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_database_basic.test 2008-12-12 20:48:17 +0000
@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + la
#############################################################################
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.charact
##############################################################################
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-------------------------#'
=== renamed file 'mysql-test/t/character_set_database_func.test' => 'mysql-test/suite/sys_vars/t/character_set_database_func.test'
=== renamed file 'mysql-test/t/character_set_filesystem_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test'
--- a/mysql-test/t/character_set_filesystem_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test 2008-12-12 20:48:17 +0000
@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 +
###############################################################################
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.charact
##############################################################################
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-------------------------#'
=== renamed file 'mysql-test/t/character_set_filesystem_func-master.opt' => 'mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt'
=== renamed file 'mysql-test/t/character_set_results_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_results_basic.test'
--- a/mysql-test/t/character_set_results_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_results_basic.test 2008-12-12 20:48:17 +0000
@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + lat
##############################################################################
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.charact
###############################################################################
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-------------------------#'
=== renamed file 'mysql-test/t/character_set_results_func.test' => 'mysql-test/suite/sys_vars/t/character_set_results_func.test'
=== renamed file 'mysql-test/t/character_set_server_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_server_basic.test'
--- a/mysql-test/t/character_set_server_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_server_basic.test 2008-12-12 20:48:17 +0000
@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + lati
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.charact
###############################################################################
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-------------------------#'
=== renamed file 'mysql-test/t/character_set_server_func.test' => 'mysql-test/suite/sys_vars/t/character_set_server_func.test'
=== renamed file 'mysql-test/t/character_set_system_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_system_basic.test'
=== renamed file 'mysql-test/t/collation_connection_basic.test' => 'mysql-test/suite/sys_vars/t/collation_connection_basic.test'
--- a/mysql-test/t/collation_connection_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/collation_connection_basic.test 2008-12-12 20:48:17 +0000
@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_gene
###############################################################################
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.colla
###############################################################################
let collation_variable = @@global.collation_connection;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_08-------------------------#'
=== renamed file 'mysql-test/t/collation_connection_func.test' => 'mysql-test/suite/sys_vars/t/collation_connection_func.test'
=== renamed file 'mysql-test/t/collation_database_basic.test' => 'mysql-test/suite/sys_vars/t/collation_database_basic.test'
--- a/mysql-test/t/collation_database_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/collation_database_basic.test 2008-12-12 20:48:17 +0000
@@ -121,7 +121,7 @@ SET @@collation_database = latin7_genera
###########################################################################
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.colla
###############################################################################
let collation_variable = @@global.collation_database;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_08-------------------------#'
=== renamed file 'mysql-test/t/collation_database_func.test' => 'mysql-test/suite/sys_vars/t/collation_database_func.test'
=== renamed file 'mysql-test/t/collation_server_basic.test' => 'mysql-test/suite/sys_vars/t/collation_server_basic.test'
--- a/mysql-test/t/collation_server_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/collation_server_basic.test 2008-12-12 20:48:17 +0000
@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_
##############################################################################
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.colla
#############################################################################
let collation_variable = @@global.collation_server;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_08-------------------------#'
=== renamed file 'mysql-test/t/collation_server_func.test' => 'mysql-test/suite/sys_vars/t/collation_server_func.test'
=== renamed file 'mysql-test/t/completion_type_basic.test' => 'mysql-test/suite/sys_vars/t/completion_type_basic.test'
=== renamed file 'mysql-test/t/completion_type_func-master.opt' => 'mysql-test/suite/sys_vars/t/completion_type_func-master.opt'
=== renamed file 'mysql-test/t/completion_type_func.test' => 'mysql-test/suite/sys_vars/t/completion_type_func.test'
=== renamed file 'mysql-test/t/concurrent_insert_basic.test' => 'mysql-test/suite/sys_vars/t/concurrent_insert_basic.test'
=== renamed file 'mysql-test/t/concurrent_insert_func.test' => 'mysql-test/suite/sys_vars/t/concurrent_insert_func.test'
=== renamed file 'mysql-test/t/connect_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/connect_timeout_basic.test'
=== renamed file 'mysql-test/t/datadir_basic.test' => 'mysql-test/suite/sys_vars/t/datadir_basic.test'
=== renamed file 'mysql-test/t/default_week_format_basic.test' => 'mysql-test/suite/sys_vars/t/default_week_format_basic.test'
=== renamed file 'mysql-test/t/default_week_format_func.test' => 'mysql-test/suite/sys_vars/t/default_week_format_func.test'
=== renamed file 'mysql-test/t/delay_key_write_basic.test' => 'mysql-test/suite/sys_vars/t/delay_key_write_basic.test'
=== renamed file 'mysql-test/t/delay_key_write_func-master.opt' => 'mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt'
=== renamed file 'mysql-test/t/delay_key_write_func.test' => 'mysql-test/suite/sys_vars/t/delay_key_write_func.test'
=== renamed file 'mysql-test/t/delayed_insert_limit_func.test' => 'mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test'
=== renamed file 'mysql-test/t/delayed_insert_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test'
=== modified file 'mysql-test/suite/sys_vars/t/disabled.def'
--- a/mysql-test/suite/sys_vars/t/disabled.def 2009-01-09 08:58:18 +0000
+++ b/mysql-test/suite/sys_vars/t/disabled.def 2009-01-21 13:32:02 +0000
@@ -16,3 +16,7 @@ query_cache_size_basic_64 : Bug#36747:
query_alloc_block_size_basic_64: Bug #37708 query_alloc_block_size_basic_64 fails in pushbuild
key_buffer_size_basic_32 : Bug#36876 main.key_buffer_size_basic_32 fails on some systems
max_heap_table_size_basic_32 : Bug#36877 main.max_heap_table_size_basic_32 fails on some systems
+#query_cache_wlock_invalidate_func : Bug#37962 2008-12-08 Test contains sleeps/race conditions
+#thread_cache_size_func : Bug#40575 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
+log_output_basic : Bug#40988 log_output_basic.test succeeded though syntactically false.
+
=== renamed file 'mysql-test/t/div_precision_increment_basic.test' => 'mysql-test/suite/sys_vars/t/div_precision_increment_basic.test'
=== renamed file 'mysql-test/t/div_precision_increment_func.test' => 'mysql-test/suite/sys_vars/t/div_precision_increment_func.test'
=== renamed file 'mysql-test/t/engine_condition_pushdown_basic.test' => 'mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test'
=== renamed file 'mysql-test/t/error_count_basic.test' => 'mysql-test/suite/sys_vars/t/error_count_basic.test'
=== renamed file 'mysql-test/t/event_scheduler_basic.test' => 'mysql-test/suite/sys_vars/t/event_scheduler_basic.test'
=== renamed file 'mysql-test/t/event_scheduler_func.test' => 'mysql-test/suite/sys_vars/t/event_scheduler_func.test'
=== renamed file 'mysql-test/t/expire_logs_days_basic.test' => 'mysql-test/suite/sys_vars/t/expire_logs_days_basic.test'
=== renamed file 'mysql-test/t/flush_basic.test' => 'mysql-test/suite/sys_vars/t/flush_basic.test'
=== renamed file 'mysql-test/t/foreign_key_checks_basic.test' => 'mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test'
=== renamed file 'mysql-test/t/foreign_key_checks_func.test' => 'mysql-test/suite/sys_vars/t/foreign_key_checks_func.test'
=== renamed file 'mysql-test/t/ft_boolean_syntax_basic.test' => 'mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test'
=== renamed file 'mysql-test/t/ft_boolean_syntax_func.test' => 'mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test'
=== renamed file 'mysql-test/t/general_log_basic.test' => 'mysql-test/suite/sys_vars/t/general_log_basic.test'
=== renamed file 'mysql-test/t/general_log_file_basic-master.opt' => 'mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt'
=== renamed file 'mysql-test/t/general_log_file_basic.test' => 'mysql-test/suite/sys_vars/t/general_log_file_basic.test'
=== renamed file 'mysql-test/t/general_log_file_func-master.opt' => 'mysql-test/suite/sys_vars/t/general_log_file_func-master.opt'
=== renamed file 'mysql-test/t/general_log_file_func.test' => 'mysql-test/suite/sys_vars/t/general_log_file_func.test'
=== renamed file 'mysql-test/t/general_log_func.test' => 'mysql-test/suite/sys_vars/t/general_log_func.test'
=== renamed file 'mysql-test/t/group_concat_max_len_basic.test' => 'mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test'
=== renamed file 'mysql-test/t/group_concat_max_len_func.test' => 'mysql-test/suite/sys_vars/t/group_concat_max_len_func.test'
=== renamed file 'mysql-test/t/have_compress_basic.test' => 'mysql-test/suite/sys_vars/t/have_compress_basic.test'
=== renamed file 'mysql-test/t/have_crypt_basic.test' => 'mysql-test/suite/sys_vars/t/have_crypt_basic.test'
=== renamed file 'mysql-test/t/have_csv_basic.test' => 'mysql-test/suite/sys_vars/t/have_csv_basic.test'
=== renamed file 'mysql-test/t/have_dynamic_loading_basic.test' => 'mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test'
=== renamed file 'mysql-test/t/have_geometry_basic.test' => 'mysql-test/suite/sys_vars/t/have_geometry_basic.test'
=== renamed file 'mysql-test/t/have_innodb_basic.test' => 'mysql-test/suite/sys_vars/t/have_innodb_basic.test'
=== renamed file 'mysql-test/t/have_ndbcluster_basic.test' => 'mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test'
=== renamed file 'mysql-test/t/have_openssl_basic.test' => 'mysql-test/suite/sys_vars/t/have_openssl_basic.test'
=== renamed file 'mysql-test/t/have_partitioning_basic.test' => 'mysql-test/suite/sys_vars/t/have_partitioning_basic.test'
=== renamed file 'mysql-test/t/have_query_cache_basic.test' => 'mysql-test/suite/sys_vars/t/have_query_cache_basic.test'
=== renamed file 'mysql-test/t/have_rtree_keys_basic.test' => 'mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test'
=== renamed file 'mysql-test/t/have_ssl_basic.test' => 'mysql-test/suite/sys_vars/t/have_ssl_basic.test'
=== renamed file 'mysql-test/t/have_symlink_basic.test' => 'mysql-test/suite/sys_vars/t/have_symlink_basic.test'
=== renamed file 'mysql-test/t/hostname_basic.test' => 'mysql-test/suite/sys_vars/t/hostname_basic.test'
=== renamed file 'mysql-test/t/identity_basic.test' => 'mysql-test/suite/sys_vars/t/identity_basic.test'
=== renamed file 'mysql-test/t/identity_func-master.opt' => 'mysql-test/suite/sys_vars/t/identity_func-master.opt'
=== renamed file 'mysql-test/t/identity_func.test' => 'mysql-test/suite/sys_vars/t/identity_func.test'
=== renamed file 'mysql-test/t/init_connect_basic.test' => 'mysql-test/suite/sys_vars/t/init_connect_basic.test'
=== renamed file 'mysql-test/t/init_slave_basic.test' => 'mysql-test/suite/sys_vars/t/init_slave_basic.test'
=== renamed file 'mysql-test/t/innodb_additional_mem_pool_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test'
=== renamed file 'mysql-test/t/innodb_autoextend_increment_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_func-master.opt' => 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_func.test' => 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test'
=== renamed file 'mysql-test/t/innodb_buffer_pool_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test'
=== renamed file 'mysql-test/t/innodb_checksums_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_checksums_basic.test'
=== renamed file 'mysql-test/t/innodb_commit_concurrency_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test'
=== renamed file 'mysql-test/t/innodb_data_file_path_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test'
=== renamed file 'mysql-test/t/innodb_data_home_dir_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test'
=== renamed file 'mysql-test/t/innodb_doublewrite_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test'
=== renamed file 'mysql-test/t/innodb_fast_shutdown_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test'
=== renamed file 'mysql-test/t/innodb_file_io_threads_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test'
=== renamed file 'mysql-test/t/innodb_file_per_table_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test'
=== renamed file 'mysql-test/t/innodb_flush_log_at_trx_commit_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test'
=== renamed file 'mysql-test/t/innodb_flush_method_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test'
=== renamed file 'mysql-test/t/innodb_force_recovery_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test'
=== renamed file 'mysql-test/t/innodb_lock_wait_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test'
=== renamed file 'mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test'
=== renamed file 'mysql-test/t/innodb_log_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test'
=== renamed file 'mysql-test/t/innodb_log_file_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test'
=== renamed file 'mysql-test/t/innodb_log_files_in_group_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test'
=== renamed file 'mysql-test/t/innodb_log_group_home_dir_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test'
=== renamed file 'mysql-test/t/innodb_max_dirty_pages_pct_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test'
=== renamed file 'mysql-test/t/innodb_max_dirty_pages_pct_func.test' => 'mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test'
=== renamed file 'mysql-test/t/innodb_mirrored_log_groups_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test'
=== renamed file 'mysql-test/t/innodb_open_files_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_open_files_basic.test'
=== renamed file 'mysql-test/t/innodb_rollback_on_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test'
=== renamed file 'mysql-test/t/innodb_support_xa_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test'
=== renamed file 'mysql-test/t/innodb_support_xa_func.test' => 'mysql-test/suite/sys_vars/t/innodb_support_xa_func.test'
=== renamed file 'mysql-test/t/innodb_table_locks_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test'
=== renamed file 'mysql-test/t/innodb_table_locks_func.test' => 'mysql-test/suite/sys_vars/t/innodb_table_locks_func.test'
=== renamed file 'mysql-test/t/innodb_thread_concurrency_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test'
=== renamed file 'mysql-test/t/insert_id_basic.test' => 'mysql-test/suite/sys_vars/t/insert_id_basic.test'
=== renamed file 'mysql-test/t/insert_id_func.test' => 'mysql-test/suite/sys_vars/t/insert_id_func.test'
=== renamed file 'mysql-test/t/interactive_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/interactive_timeout_basic.test'
=== renamed file 'mysql-test/t/interactive_timeout_func.test' => 'mysql-test/suite/sys_vars/t/interactive_timeout_func.test'
=== renamed file 'mysql-test/t/keep_files_on_create_basic.test' => 'mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test'
=== renamed file 'mysql-test/t/key_buffer_size_func.test' => 'mysql-test/suite/sys_vars/t/key_buffer_size_func.test'
=== renamed file 'mysql-test/t/last_insert_id_func-master.opt' => 'mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt'
=== renamed file 'mysql-test/t/last_insert_id_func.test' => 'mysql-test/suite/sys_vars/t/last_insert_id_func.test'
=== renamed file 'mysql-test/t/lc_time_names_basic.test' => 'mysql-test/suite/sys_vars/t/lc_time_names_basic.test'
=== renamed file 'mysql-test/t/lc_time_names_func.test' => 'mysql-test/suite/sys_vars/t/lc_time_names_func.test'
=== renamed file 'mysql-test/t/license_basic.test' => 'mysql-test/suite/sys_vars/t/license_basic.test'
=== renamed file 'mysql-test/t/local_infile_basic.test' => 'mysql-test/suite/sys_vars/t/local_infile_basic.test'
=== renamed file 'mysql-test/t/local_infile_func.test' => 'mysql-test/suite/sys_vars/t/local_infile_func.test'
=== renamed file 'mysql-test/t/log_basic.test' => 'mysql-test/suite/sys_vars/t/log_basic.test'
=== renamed file 'mysql-test/t/log_bin_trust_function_creators_basic.test' => 'mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test'
=== renamed file 'mysql-test/t/log_bin_trust_function_creators_func.test' => 'mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test'
=== renamed file 'mysql-test/t/log_output_basic.test' => 'mysql-test/suite/sys_vars/t/log_output_basic.test'
=== renamed file 'mysql-test/t/log_output_func.test' => 'mysql-test/suite/sys_vars/t/log_output_func.test'
=== renamed file 'mysql-test/t/log_queries_not_using_indexes_basic.test' => 'mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test'
=== renamed file 'mysql-test/t/long_query_time_basic.test' => 'mysql-test/suite/sys_vars/t/long_query_time_basic.test'
=== renamed file 'mysql-test/t/low_priority_updates_basic.test' => 'mysql-test/suite/sys_vars/t/low_priority_updates_basic.test'
=== renamed file 'mysql-test/t/max_allowed_packet_basic.test' => 'mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test'
=== renamed file 'mysql-test/t/max_allowed_packet_func.test' => 'mysql-test/suite/sys_vars/t/max_allowed_packet_func.test'
=== renamed file 'mysql-test/t/max_binlog_cache_size_func-master.opt' => 'mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt'
=== renamed file 'mysql-test/t/max_binlog_size_basic.test' => 'mysql-test/suite/sys_vars/t/max_binlog_size_basic.test'
=== renamed file 'mysql-test/t/max_connections_basic.test' => 'mysql-test/suite/sys_vars/t/max_connections_basic.test'
=== renamed file 'mysql-test/t/max_delayed_threads_basic.test' => 'mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test'
=== renamed file 'mysql-test/t/max_error_count_basic.test' => 'mysql-test/suite/sys_vars/t/max_error_count_basic.test'
=== renamed file 'mysql-test/t/max_insert_delayed_threads_basic.test' => 'mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test'
=== renamed file 'mysql-test/t/max_join_size_func.test' => 'mysql-test/suite/sys_vars/t/max_join_size_func.test'
=== renamed file 'mysql-test/t/max_length_for_sort_data_basic.test' => 'mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test'
=== renamed file 'mysql-test/t/max_prepared_stmt_count_basic.test' => 'mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test'
=== renamed file 'mysql-test/t/max_prepared_stmt_count_func.test' => 'mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test'
=== renamed file 'mysql-test/t/max_relay_log_size_basic.test' => 'mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test'
=== renamed file 'mysql-test/t/max_seeks_for_key_func.test' => 'mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test'
=== renamed file 'mysql-test/t/max_sort_length_basic.test' => 'mysql-test/suite/sys_vars/t/max_sort_length_basic.test'
=== renamed file 'mysql-test/t/max_sort_length_func.test' => 'mysql-test/suite/sys_vars/t/max_sort_length_func.test'
=== renamed file 'mysql-test/t/max_sp_recursion_depth_basic.test' => 'mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test'
=== renamed file 'mysql-test/t/max_sp_recursion_depth_func.test' => 'mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test'
=== renamed file 'mysql-test/t/max_user_connections_basic.test' => 'mysql-test/suite/sys_vars/t/max_user_connections_basic.test'
=== renamed file 'mysql-test/t/max_user_connections_func.test' => 'mysql-test/suite/sys_vars/t/max_user_connections_func.test'
=== removed file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger 2008-05-07 #
-# #
-# Wrapper for 32 bit machines #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-
=== removed file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger 2008-05-07 #
-# #
-# Wrapper for 64 bit machines #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-
=== renamed file 'mysql-test/t/myisam_data_pointer_size_basic.test' => 'mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test'
=== renamed file 'mysql-test/t/myisam_data_pointer_size_func.test' => 'mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test'
=== renamed file 'mysql-test/t/myisam_stats_method_basic.test' => 'mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test'
=== renamed file 'mysql-test/t/myisam_stats_method_func.test' => 'mysql-test/suite/sys_vars/t/myisam_stats_method_func.test'
=== renamed file 'mysql-test/t/myisam_use_mmap_basic.test' => 'mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test'
=== renamed file 'mysql-test/t/ndb_log_update_as_write_basic.test' => 'mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test'
=== renamed file 'mysql-test/t/ndb_log_updated_only_basic.test' => 'mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test'
=== renamed file 'mysql-test/t/net_buffer_length_basic.test' => 'mysql-test/suite/sys_vars/t/net_buffer_length_basic.test'
=== renamed file 'mysql-test/t/net_read_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/net_read_timeout_basic.test'
=== renamed file 'mysql-test/t/net_write_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/net_write_timeout_basic.test'
=== renamed file 'mysql-test/t/new_basic.test' => 'mysql-test/suite/sys_vars/t/new_basic.test'
=== renamed file 'mysql-test/t/old_passwords_basic.test' => 'mysql-test/suite/sys_vars/t/old_passwords_basic.test'
=== renamed file 'mysql-test/t/old_passwords_func.test' => 'mysql-test/suite/sys_vars/t/old_passwords_func.test'
=== renamed file 'mysql-test/t/optimizer_prune_level_basic.test' => 'mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test'
=== renamed file 'mysql-test/t/optimizer_search_depth_basic.test' => 'mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test'
=== renamed file 'mysql-test/t/preload_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test'
=== renamed file 'mysql-test/t/query_cache_limit_func.test' => 'mysql-test/suite/sys_vars/t/query_cache_limit_func.test'
=== renamed file 'mysql-test/t/query_cache_type_basic.test' => 'mysql-test/suite/sys_vars/t/query_cache_type_basic.test'
=== renamed file 'mysql-test/t/query_cache_type_func.test' => 'mysql-test/suite/sys_vars/t/query_cache_type_func.test'
=== renamed file 'mysql-test/t/query_cache_wlock_invalidate_basic.test' => 'mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test'
=== renamed file 'mysql-test/t/query_cache_wlock_invalidate_func.test' => 'mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test'
=== renamed file 'mysql-test/t/query_prealloc_size_func.test' => 'mysql-test/suite/sys_vars/t/query_prealloc_size_func.test'
=== renamed file 'mysql-test/t/read_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/read_buffer_size_basic.test'
=== renamed file 'mysql-test/t/read_only_basic.test' => 'mysql-test/suite/sys_vars/t/read_only_basic.test'
=== renamed file 'mysql-test/t/read_only_func.test' => 'mysql-test/suite/sys_vars/t/read_only_func.test'
=== renamed file 'mysql-test/t/read_rnd_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test'
=== renamed file 'mysql-test/t/relay_log_purge_basic.test' => 'mysql-test/suite/sys_vars/t/relay_log_purge_basic.test'
=== renamed file 'mysql-test/t/rpl_init_slave_func.test' => 'mysql-test/suite/sys_vars/t/rpl_init_slave_func.test'
=== renamed file 'mysql-test/t/rpl_max_binlog_size_func-master.opt' => 'mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt'
=== renamed file 'mysql-test/t/rpl_max_binlog_size_func.test' => 'mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test'
--- a/mysql-test/t/rpl_max_binlog_size_func.test 2008-04-14 15:21:18 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test 2008-12-12 20:48:17 +0000
@@ -32,6 +32,7 @@ dec $a;
--echo 'mylog.000002 exists'
+DROP TABLE t1;
###############################################################################
# End of functionality testing for max_binlog_size #
###############################################################################
=== renamed file 'mysql-test/t/rpl_slave_allow_batching_basic.test' => 'mysql-test/suite/sys_vars/t/rpl_slave_allow_batching_basic.test'
=== renamed file 'mysql-test/t/rpl_slave_compressed_protocol_basic.test' => 'mysql-test/suite/sys_vars/t/rpl_slave_compressed_protocol_basic.test'
=== renamed file 'mysql-test/t/rpl_slave_exec_mode_basic.test' => 'mysql-test/suite/sys_vars/t/rpl_slave_exec_mode_basic.test'
=== renamed file 'mysql-test/t/rpl_slave_net_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/rpl_slave_net_timeout_basic.test'
=== renamed file 'mysql-test/t/secure_auth_basic.test' => 'mysql-test/suite/sys_vars/t/secure_auth_basic.test'
=== renamed file 'mysql-test/t/secure_auth_func-master.opt' => 'mysql-test/suite/sys_vars/t/secure_auth_func-master.opt'
=== renamed file 'mysql-test/t/secure_auth_func.test' => 'mysql-test/suite/sys_vars/t/secure_auth_func.test'
=== renamed file 'mysql-test/t/slave_allow_batching_basic.test' => 'mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test'
=== renamed file 'mysql-test/t/slave_compressed_protocol_basic.test' => 'mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test'
=== renamed file 'mysql-test/t/slave_net_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test'
=== renamed file 'mysql-test/t/slow_launch_time_basic.test' => 'mysql-test/suite/sys_vars/t/slow_launch_time_basic.test'
=== renamed file 'mysql-test/t/slow_launch_time_func.test' => 'mysql-test/suite/sys_vars/t/slow_launch_time_func.test'
=== renamed file 'mysql-test/t/slow_query_log_basic.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_basic.test'
=== renamed file 'mysql-test/t/slow_query_log_file_basic-master.opt' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt'
=== renamed file 'mysql-test/t/slow_query_log_file_basic.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test'
=== renamed file 'mysql-test/t/slow_query_log_file_func-master.opt' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt'
=== renamed file 'mysql-test/t/slow_query_log_file_func.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_func.test'
=== renamed file 'mysql-test/t/slow_query_log_func.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_func.test'
=== renamed file 'mysql-test/t/sql_auto_is_null_basic.test' => 'mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test'
=== renamed file 'mysql-test/t/sql_big_selects_basic.test' => 'mysql-test/suite/sys_vars/t/sql_big_selects_basic.test'
=== renamed file 'mysql-test/t/sql_big_selects_func.test' => 'mysql-test/suite/sys_vars/t/sql_big_selects_func.test'
=== renamed file 'mysql-test/t/sql_big_tables_basic.test' => 'mysql-test/suite/sys_vars/t/sql_big_tables_basic.test'
=== renamed file 'mysql-test/t/sql_big_tables_func.test' => 'mysql-test/suite/sys_vars/t/sql_big_tables_func.test'
=== renamed file 'mysql-test/t/sql_buffer_result_basic.test' => 'mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test'
=== renamed file 'mysql-test/t/sql_buffer_result_func.test' => 'mysql-test/suite/sys_vars/t/sql_buffer_result_func.test'
=== renamed file 'mysql-test/t/sql_log_bin_basic.test' => 'mysql-test/suite/sys_vars/t/sql_log_bin_basic.test'
=== renamed file 'mysql-test/t/sql_log_off_basic.test' => 'mysql-test/suite/sys_vars/t/sql_log_off_basic.test'
=== renamed file 'mysql-test/t/sql_log_off_func.test' => 'mysql-test/suite/sys_vars/t/sql_log_off_func.test'
=== renamed file 'mysql-test/t/sql_low_priority_updates_basic.test' => 'mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test'
=== renamed file 'mysql-test/t/sql_low_priority_updates_func.test' => 'mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test'
=== renamed file 'mysql-test/t/sql_max_join_size_func.test' => 'mysql-test/suite/sys_vars/t/sql_max_join_size_func.test'
=== renamed file 'mysql-test/t/sql_mode_basic.test' => 'mysql-test/suite/sys_vars/t/sql_mode_basic.test'
=== renamed file 'mysql-test/t/sql_mode_func.test' => 'mysql-test/suite/sys_vars/t/sql_mode_func.test'
=== renamed file 'mysql-test/t/sql_notes_basic.test' => 'mysql-test/suite/sys_vars/t/sql_notes_basic.test'
=== renamed file 'mysql-test/t/sql_notes_func.test' => 'mysql-test/suite/sys_vars/t/sql_notes_func.test'
=== renamed file 'mysql-test/t/sql_quote_show_create_basic.test' => 'mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test'
=== renamed file 'mysql-test/t/sql_quote_show_create_func.test' => 'mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test'
=== renamed file 'mysql-test/t/sql_safe_updates_basic.test' => 'mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test'
=== renamed file 'mysql-test/t/sql_safe_updates_func.test' => 'mysql-test/suite/sys_vars/t/sql_safe_updates_func.test'
=== renamed file 'mysql-test/t/sql_select_limit_func.test' => 'mysql-test/suite/sys_vars/t/sql_select_limit_func.test'
=== renamed file 'mysql-test/t/sql_slave_skip_counter_basic.test' => 'mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test'
=== renamed file 'mysql-test/t/sql_warnings_basic.test' => 'mysql-test/suite/sys_vars/t/sql_warnings_basic.test'
=== renamed file 'mysql-test/t/sql_warnings_func.test' => 'mysql-test/suite/sys_vars/t/sql_warnings_func.test'
=== renamed file 'mysql-test/t/ssl_ca_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_ca_basic.test'
=== renamed file 'mysql-test/t/ssl_capath_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_capath_basic.test'
=== renamed file 'mysql-test/t/ssl_cert_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_cert_basic.test'
=== renamed file 'mysql-test/t/ssl_cipher_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_cipher_basic.test'
=== renamed file 'mysql-test/t/ssl_key_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_key_basic.test'
=== renamed file 'mysql-test/t/storage_engine_basic-master.opt' => 'mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt'
=== renamed file 'mysql-test/t/storage_engine_basic.test' => 'mysql-test/suite/sys_vars/t/storage_engine_basic.test'
=== renamed file 'mysql-test/t/sync_frm_basic.test' => 'mysql-test/suite/sys_vars/t/sync_frm_basic.test'
=== renamed file 'mysql-test/t/system_time_zone_basic.test' => 'mysql-test/suite/sys_vars/t/system_time_zone_basic.test'
=== renamed file 'mysql-test/t/table_definition_cache_basic.test' => 'mysql-test/suite/sys_vars/t/table_definition_cache_basic.test'
=== renamed file 'mysql-test/t/table_lock_wait_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test'
=== renamed file 'mysql-test/t/table_open_cache_basic.test' => 'mysql-test/suite/sys_vars/t/table_open_cache_basic.test'
=== renamed file 'mysql-test/t/thread_cache_size_func.test' => 'mysql-test/suite/sys_vars/t/thread_cache_size_func.test'
=== renamed file 'mysql-test/t/thread_handling_basic.test' => 'mysql-test/suite/sys_vars/t/thread_handling_basic.test'
=== renamed file 'mysql-test/t/time_zone_basic.test' => 'mysql-test/suite/sys_vars/t/time_zone_basic.test'
=== renamed file 'mysql-test/t/time_zone_func.test' => 'mysql-test/suite/sys_vars/t/time_zone_func.test'
=== renamed file 'mysql-test/t/timed_mutexes_basic.test' => 'mysql-test/suite/sys_vars/t/timed_mutexes_basic.test'
=== renamed file 'mysql-test/t/timestamp_func.test' => 'mysql-test/suite/sys_vars/t/timestamp_func.test'
=== renamed file 'mysql-test/t/timestamp_sysdate_is_now_func-master.opt' => 'mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt'
=== renamed file 'mysql-test/t/timestamp_sysdate_is_now_func.test' => 'mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test'
=== renamed file 'mysql-test/t/tmpdir_basic.test' => 'mysql-test/suite/sys_vars/t/tmpdir_basic.test'
=== renamed file 'mysql-test/t/tx_isolation_basic.test' => 'mysql-test/suite/sys_vars/t/tx_isolation_basic.test'
=== renamed file 'mysql-test/t/tx_isolation_func-master.opt' => 'mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt'
=== renamed file 'mysql-test/t/tx_isolation_func.test' => 'mysql-test/suite/sys_vars/t/tx_isolation_func.test'
=== renamed file 'mysql-test/t/unique_checks_basic.test' => 'mysql-test/suite/sys_vars/t/unique_checks_basic.test'
=== renamed file 'mysql-test/t/updatable_views_with_limit_basic.test' => 'mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test'
=== renamed file 'mysql-test/t/updatable_views_with_limit_func.test' => 'mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test'
=== renamed file 'mysql-test/t/version_basic.test' => 'mysql-test/suite/sys_vars/t/version_basic.test'
=== renamed file 'mysql-test/t/version_comment_basic.test' => 'mysql-test/suite/sys_vars/t/version_comment_basic.test'
=== renamed file 'mysql-test/t/version_compile_machine_basic.test' => 'mysql-test/suite/sys_vars/t/version_compile_machine_basic.test'
=== renamed file 'mysql-test/t/version_compile_os_basic.test' => 'mysql-test/suite/sys_vars/t/version_compile_os_basic.test'
=== renamed file 'mysql-test/t/wait_timeout_func.test' => 'mysql-test/suite/sys_vars/t/wait_timeout_func.test'
=== renamed file 'mysql-test/t/warning_count_basic.test' => 'mysql-test/suite/sys_vars/t/warning_count_basic.test'
=== modified file 'storage/falcon/StorageVersion.h'
--- a/storage/falcon/StorageVersion.h 2009-01-22 15:19:51 +0000
+++ b/storage/falcon/StorageVersion.h 2009-01-23 11:13:17 +0000
@@ -14,5 +14,5 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#define FALCON_VERSION "T1.4-2"
-#define FALCON_DATE "22 January, 2009"
+#define FALCON_VERSION "T1.4-3"
+#define FALCON_DATE "23 January, 2009"
| Thread |
|---|
| • bzr commit into mysql-6.0-falcon-team branch (hky:2973) | Hakan Kuecuekyilmaz | 23 Jan |
