List:Commits« Previous MessageNext Message »
From:Luis Soares Date:February 1 2009 1:17pm
Subject:bzr push into mysql-5.1-rpl branch (luis.soares:2724 to 2725) Bug#42485
View as plain text  
 2725 Luis Soares	2009-02-01
      BUG#42485: Pushbuild2 and some build tools do not work together with MTR2
            
      It seems that the length of the thick line printed by mtr when printing the 
      suite name differs from mtr1 and mtr2, affecting the mtr filtering by PB2.
            
      This patch addresses it by restoring the thick line length to 78 (original
      length) instead of 60 (the one in mtr2).
modified:
  mysql-test/lib/mtr_report.pm

 2724 Luis Soares	2009-01-29 [merge]
      merge: 5.1 -> 5.1-rpl-merge
      conflicts:
        Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
        Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.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_bin_trust_routine_creators_basic.result => mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.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/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_exec_mode_basic.result => mysql-test/suite/sys_vars/r/slave_exec_mode_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_bin_trust_routine_creators_basic.test => mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.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/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_exec_mode_basic.test => mysql-test/suite/sys_vars/t/slave_exec_mode_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/query_cache_size_basic.inc
  mysql-test/suite/sys_vars/inc/query_prealloc_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/log_warnings_basic_32.result
  mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
  mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.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_cache_size_basic_64.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/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

=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2009-01-28 09:28:48 +0000
+++ b/mysql-test/lib/mtr_report.pm	2009-02-01 13:14:39 +0000
@@ -354,7 +354,7 @@ sub mtr_print_line () {
 
 sub mtr_print_thick_line {
   my $char= shift || '=';
-  print $char x 60, "\n";
+  print $char x 78, "\n";
 }
 
 

Thread
bzr push into mysql-5.1-rpl branch (luis.soares:2724 to 2725) Bug#42485Luis Soares1 Feb