From: Date: June 18 2008 12:22pm Subject: bzr push into mysql-6.0 branch (monty:2656) Bug#36055 List-Archive: http://lists.mysql.com/commits/48064 X-Bug: 36055 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2656 Sven Sandberg 2008-06-12 [merge] Merge of the following in 6.0-rpl: pull from main and bug number 37200 removed: extra/yassl/taocrypt/taocrypt.dsp extra/yassl/taocrypt/taocrypt.dsw extra/yassl/taocrypt/taocrypt.vcproj extra/yassl/yassl.dsp extra/yassl/yassl.dsw extra/yassl/yassl.vcproj mysql-test/r/outfile.result mysql-test/suite/funcs_1/data/ mysql-test/suite/funcs_1/triggers/triggers_master.test mysql-test/suite/parts/inc/partition_alter1.inc mysql-test/suite/parts/r/partition_alter1_innodb.result mysql-test/suite/parts/r/partition_alter1_myisam.result mysql-test/suite/parts/t/partition_alter1_innodb.test mysql-test/suite/parts/t/partition_alter1_myisam.test mysql-test/suite/parts/t/partition_alter1_ndb.test added: .bzr-mysql/ .bzr-mysql/default.conf BUILD/compile-pentium-valgrind-max-no-ndb config/ac-macros/libevent_configure.m4 extra/libevent/evrpc-internal.h extra/libevent/evrpc.c extra/libevent/evrpc.h extra/libevent/evutil.c extra/libevent/evutil.h extra/libevent/min_heap.h mysql-test/include/binlog_cache_size_basic.inc mysql-test/include/bulk_insert_buffer_size_basic.inc mysql-test/include/charset_basic.inc mysql-test/include/collation_basic.inc mysql-test/include/delayed_insert_limit_basic.inc mysql-test/include/delayed_queue_size_basic.inc mysql-test/include/have_32bit.inc mysql-test/include/have_64bit.inc mysql-test/include/innodb_concurrency_tickets_basic.inc mysql-test/include/innodb_max_purge_lag_basic.inc mysql-test/include/innodb_sync_spin_loops_basic.inc mysql-test/include/is_embedded.inc mysql-test/include/join_buffer_size_basic.inc mysql-test/include/key_buffer_size_basic.inc mysql-test/include/key_cache_age_threshold_basic.inc mysql-test/include/key_cache_block_size_basic.inc mysql-test/include/key_cache_division_limit_basic.inc mysql-test/include/linux_sys_vars.inc mysql-test/include/load_sysvars.inc mysql-test/include/log_warnings_basic.inc mysql-test/include/max_binlog_cache_size_basic.inc mysql-test/include/max_connect_errors_basic.inc mysql-test/include/max_heap_table_size_basic.inc mysql-test/include/max_seeks_for_key_basic.inc mysql-test/include/max_tmp_tables_basic.inc mysql-test/include/max_write_lock_count_basic.inc mysql-test/include/min_examined_row_limit_basic.inc mysql-test/include/myisam_max_sort_file_size_basic.inc mysql-test/include/myisam_repair_threads_basic.inc mysql-test/include/myisam_sort_buffer_size_basic.inc mysql-test/include/net_retry_count_basic.inc mysql-test/include/query_alloc_block_size_basic.inc mysql-test/include/query_cache_limit_basic.inc mysql-test/include/query_cache_min_res_unit_basic.inc mysql-test/include/query_cache_size_basic.inc mysql-test/include/query_prealloc_size_basic.inc mysql-test/include/range_alloc_block_size_basic.inc mysql-test/include/rpl_recovery_rank_basic.inc mysql-test/include/server_id_basic.inc mysql-test/include/slave_transaction_retries_basic.inc mysql-test/include/sort_buffer_size_basic.inc mysql-test/include/sync_binlog_basic.inc mysql-test/include/timestamp_basic.inc mysql-test/include/tmp_table_size_basic.inc mysql-test/include/transaction_alloc_block_size_basic.inc mysql-test/include/transaction_prealloc_size_basic.inc mysql-test/include/wait_for_slave_sql_to_start.inc mysql-test/include/wait_timeout_basic.inc mysql-test/include/windows_sys_vars.inc mysql-test/r/auto_commit_basic.result mysql-test/r/auto_increment_increment_basic.result mysql-test/r/auto_increment_increment_func.result mysql-test/r/auto_increment_offset_basic.result mysql-test/r/auto_increment_offset_func.result mysql-test/r/autocommit_func.result mysql-test/r/automatic_sp_privileges_basic.result mysql-test/r/automatic_sp_privileges_func.result mysql-test/r/backup_tablespace.result mysql-test/r/basedir_basic.result mysql-test/r/big_tables_basic.result mysql-test/r/binlog_cache_size_basic_32.result mysql-test/r/binlog_cache_size_basic_64.result mysql-test/r/binlog_format_basic.result mysql-test/r/bulk_insert_buffer_size_basic_32.result mysql-test/r/bulk_insert_buffer_size_basic_64.result mysql-test/r/character_set_client_basic.result mysql-test/r/character_set_client_func.result mysql-test/r/character_set_connection_basic.result mysql-test/r/character_set_connection_func.result mysql-test/r/character_set_database_basic.result mysql-test/r/character_set_database_func.result mysql-test/r/character_set_filesystem_basic.result mysql-test/r/character_set_results_basic.result mysql-test/r/character_set_results_func.result mysql-test/r/character_set_server_basic.result mysql-test/r/character_set_server_func.result mysql-test/r/character_set_system_basic.result mysql-test/r/collation_connection_basic.result mysql-test/r/collation_connection_func.result mysql-test/r/collation_database_basic.result mysql-test/r/collation_database_func.result mysql-test/r/collation_server_basic.result mysql-test/r/collation_server_func.result mysql-test/r/completion_type_basic.result mysql-test/r/completion_type_func.result mysql-test/r/concurrent_insert_basic.result mysql-test/r/concurrent_insert_func.result mysql-test/r/connect_timeout_basic.result mysql-test/r/datadir_basic.result mysql-test/r/default_week_format_basic.result mysql-test/r/default_week_format_func.result mysql-test/r/delay_key_write_basic.result mysql-test/r/delay_key_write_func.result mysql-test/r/delayed_insert_limit_basic_32.result mysql-test/r/delayed_insert_limit_basic_64.result mysql-test/r/delayed_insert_limit_func.result mysql-test/r/delayed_insert_timeout_basic.result mysql-test/r/delayed_queue_size_basic_32.result mysql-test/r/delayed_queue_size_basic_64.result mysql-test/r/div_precision_increment_basic.result mysql-test/r/div_precision_increment_func.result mysql-test/r/engine_condition_pushdown_basic.result mysql-test/r/error_count_basic.result mysql-test/r/event_scheduler_basic.result mysql-test/r/event_scheduler_func.result mysql-test/r/events_embedded.result mysql-test/r/expire_logs_days_basic.result mysql-test/r/flush_basic.result mysql-test/r/foreign_key_checks_basic.result mysql-test/r/foreign_key_checks_func.result mysql-test/r/ft_boolean_syntax_basic.result mysql-test/r/ft_boolean_syntax_func.result mysql-test/r/func_rollback.result mysql-test/r/general_log_basic.result mysql-test/r/general_log_file_basic.result mysql-test/r/general_log_file_func.result mysql-test/r/general_log_func.result mysql-test/r/grant4.result mysql-test/r/group_concat_max_len_basic.result mysql-test/r/group_concat_max_len_func.result mysql-test/r/have_compress_basic.result mysql-test/r/have_crypt_basic.result mysql-test/r/have_csv_basic.result mysql-test/r/have_dynamic_loading_basic.result mysql-test/r/have_geometry_basic.result mysql-test/r/have_innodb_basic.result mysql-test/r/have_ndbcluster_basic.result mysql-test/r/have_openssl_basic.result mysql-test/r/have_partitioning_basic.result mysql-test/r/have_query_cache_basic.result mysql-test/r/have_rtree_keys_basic.result mysql-test/r/have_ssl_basic.result mysql-test/r/have_symlink_basic.result mysql-test/r/hostname_basic.result mysql-test/r/identity_basic.result mysql-test/r/identity_func.result mysql-test/r/init_connect_basic.result mysql-test/r/init_slave_basic.result mysql-test/r/innodb_additional_mem_pool_size_basic.result mysql-test/r/innodb_autoextend_increment_basic.result mysql-test/r/innodb_autoinc_lock_mode_basic.result mysql-test/r/innodb_autoinc_lock_mode_func.result mysql-test/r/innodb_buffer_pool_size_basic.result mysql-test/r/innodb_checksums_basic.result mysql-test/r/innodb_commit_concurrency_basic.result mysql-test/r/innodb_concurrency_tickets_basic_32.result mysql-test/r/innodb_concurrency_tickets_basic_64.result mysql-test/r/innodb_data_file_path_basic.result mysql-test/r/innodb_data_home_dir_basic.result mysql-test/r/innodb_doublewrite_basic.result mysql-test/r/innodb_fast_shutdown_basic.result mysql-test/r/innodb_file_io_threads_basic.result mysql-test/r/innodb_file_per_table_basic.result mysql-test/r/innodb_flush_log_at_trx_commit_basic.result mysql-test/r/innodb_flush_method_basic.result mysql-test/r/innodb_force_recovery_basic.result mysql-test/r/innodb_lock_wait_timeout_basic.result mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result mysql-test/r/innodb_log_buffer_size_basic.result mysql-test/r/innodb_log_file_size_basic.result mysql-test/r/innodb_log_files_in_group_basic.result mysql-test/r/innodb_log_group_home_dir_basic.result mysql-test/r/innodb_max_dirty_pages_pct_basic.result mysql-test/r/innodb_max_dirty_pages_pct_func.result mysql-test/r/innodb_max_purge_lag_basic_32.result mysql-test/r/innodb_max_purge_lag_basic_64.result mysql-test/r/innodb_mirrored_log_groups_basic.result mysql-test/r/innodb_open_files_basic.result mysql-test/r/innodb_rollback_on_timeout_basic.result mysql-test/r/innodb_support_xa_basic.result mysql-test/r/innodb_support_xa_func.result mysql-test/r/innodb_sync_spin_loops_basic_32.result mysql-test/r/innodb_sync_spin_loops_basic_64.result mysql-test/r/innodb_table_locks_basic.result mysql-test/r/innodb_table_locks_func.result mysql-test/r/innodb_thread_concurrency_basic.result mysql-test/r/innodb_thread_sleep_delay_basic.result mysql-test/r/insert_id_basic.result mysql-test/r/insert_id_func.result mysql-test/r/interactive_timeout_basic.result mysql-test/r/interactive_timeout_func.result mysql-test/r/is_embedded.require mysql-test/r/join_buffer_size_basic_32.result mysql-test/r/join_buffer_size_basic_64.result mysql-test/r/keep_files_on_create_basic.result mysql-test/r/key_buffer_size_basic_32.result mysql-test/r/key_buffer_size_basic_64.result mysql-test/r/key_buffer_size_func.result mysql-test/r/key_cache_age_threshold_basic_32.result mysql-test/r/key_cache_age_threshold_basic_64.result mysql-test/r/key_cache_block_size_basic_32.result mysql-test/r/key_cache_block_size_basic_64.result mysql-test/r/key_cache_division_limit_basic_32.result mysql-test/r/key_cache_division_limit_basic_64.result mysql-test/r/last_insert_id_func.result mysql-test/r/lc_time_names_basic.result mysql-test/r/lc_time_names_func.result mysql-test/r/license_basic.result mysql-test/r/local_infile_basic.result mysql-test/r/local_infile_func.result mysql-test/r/log_basic.result mysql-test/r/log_bin_trust_function_creators_basic.result mysql-test/r/log_bin_trust_function_creators_func.result mysql-test/r/log_output_basic.result mysql-test/r/log_output_func.result mysql-test/r/log_queries_not_using_indexes_basic.result mysql-test/r/log_warnings_basic_32.result mysql-test/r/log_warnings_basic_64.result mysql-test/r/long_query_time_basic.result mysql-test/r/low_priority_updates_basic.result mysql-test/r/lowercase_utf8.result mysql-test/r/max_allowed_packet_basic.result mysql-test/r/max_allowed_packet_func.result mysql-test/r/max_binlog_cache_size_basic_32.result mysql-test/r/max_binlog_cache_size_basic_64.result mysql-test/r/max_binlog_cache_size_func.result mysql-test/r/max_binlog_size_basic.result mysql-test/r/max_connect_errors_basic_32.result mysql-test/r/max_connect_errors_basic_64.result mysql-test/r/max_connections_basic.result mysql-test/r/max_delayed_threads_basic.result mysql-test/r/max_error_count_basic.result mysql-test/r/max_heap_table_size_basic_32.result mysql-test/r/max_heap_table_size_basic_64.result mysql-test/r/max_insert_delayed_threads_basic.result mysql-test/r/max_join_size_func.result mysql-test/r/max_length_for_sort_data_basic.result mysql-test/r/max_prepared_stmt_count_basic.result mysql-test/r/max_prepared_stmt_count_func.result mysql-test/r/max_relay_log_size_basic.result mysql-test/r/max_seeks_for_key_basic_32.result mysql-test/r/max_seeks_for_key_basic_64.result mysql-test/r/max_seeks_for_key_func.result mysql-test/r/max_sort_length_basic.result mysql-test/r/max_sort_length_func.result mysql-test/r/max_sp_recursion_depth_basic.result mysql-test/r/max_sp_recursion_depth_func.result mysql-test/r/max_tmp_tables_basic_32.result mysql-test/r/max_tmp_tables_basic_64.result mysql-test/r/max_user_connections_basic.result mysql-test/r/max_user_connections_func.result mysql-test/r/max_write_lock_count_basic_32.result mysql-test/r/max_write_lock_count_basic_64.result mysql-test/r/min_examined_row_limit_basic_32.result mysql-test/r/min_examined_row_limit_basic_64.result mysql-test/r/multi_update_tiny_hash.result mysql-test/r/myisam_data_pointer_size_basic.result mysql-test/r/myisam_data_pointer_size_func.result mysql-test/r/myisam_max_sort_file_size_basic_32.result mysql-test/r/myisam_max_sort_file_size_basic_64.result mysql-test/r/myisam_repair_threads_basic_32.result mysql-test/r/myisam_repair_threads_basic_64.result mysql-test/r/myisam_sort_buffer_size_basic.result mysql-test/r/myisam_sort_buffer_size_basic_32.result mysql-test/r/myisam_sort_buffer_size_basic_64.result mysql-test/r/myisam_stats_method_basic.result mysql-test/r/myisam_stats_method_func.result mysql-test/r/myisam_use_mmap_basic.result mysql-test/r/ndb_log_update_as_write_basic.result mysql-test/r/ndb_log_updated_only_basic.result mysql-test/r/net_buffer_length_basic.result mysql-test/r/net_read_timeout_basic.result mysql-test/r/net_retry_count_basic_32.result mysql-test/r/net_retry_count_basic_64.result mysql-test/r/net_write_timeout_basic.result mysql-test/r/new_basic.result mysql-test/r/old_passwords_basic.result mysql-test/r/old_passwords_func.result mysql-test/r/optimizer_prune_level_basic.result mysql-test/r/optimizer_search_depth_basic.result mysql-test/r/outfile.result mysql-test/r/preload_buffer_size_basic.result mysql-test/r/ps_ddl1.result mysql-test/r/query_alloc_block_size_basic_32.result mysql-test/r/query_alloc_block_size_basic_64.result mysql-test/r/query_cache_limit_basic_32.result mysql-test/r/query_cache_limit_basic_64.result mysql-test/r/query_cache_limit_func.result mysql-test/r/query_cache_min_res_unit_basic_32.result mysql-test/r/query_cache_min_res_unit_basic_64.result mysql-test/r/query_cache_size_basic_32.result mysql-test/r/query_cache_size_basic_64.result mysql-test/r/query_cache_type_basic.result mysql-test/r/query_cache_type_func.result mysql-test/r/query_cache_wlock_invalidate_basic.result mysql-test/r/query_cache_wlock_invalidate_func.result mysql-test/r/query_prealloc_size_basic_32.result mysql-test/r/query_prealloc_size_basic_64.result mysql-test/r/query_prealloc_size_func.result mysql-test/r/range_alloc_block_size_basic_32.result mysql-test/r/range_alloc_block_size_basic_64.result mysql-test/r/read_buffer_size_basic.result mysql-test/r/read_only_basic.result mysql-test/r/read_only_func.result mysql-test/r/read_rnd_buffer_size_basic.result mysql-test/r/relay_log_purge_basic.result mysql-test/r/rpl_init_slave_func.result mysql-test/r/rpl_max_binlog_size_func.result mysql-test/r/rpl_recovery_rank_basic_32.result mysql-test/r/rpl_recovery_rank_basic_64.result mysql-test/r/rpl_slave_allow_batching_basic.result mysql-test/r/rpl_slave_compressed_protocol_basic.result mysql-test/r/rpl_slave_exec_mode_basic.result mysql-test/r/rpl_slave_net_timeout_basic.result mysql-test/r/rpl_slave_transaction_retries_basic_32.result mysql-test/r/rpl_slave_transaction_retries_basic_64.result mysql-test/r/rpl_sync_binlog_basic_32.result mysql-test/r/rpl_sync_binlog_basic_64.result mysql-test/r/secure_auth_basic.result mysql-test/r/secure_auth_func.result mysql-test/r/server_id_basic_32.result mysql-test/r/server_id_basic_64.result mysql-test/r/slow_launch_time_basic.result mysql-test/r/slow_launch_time_func.result mysql-test/r/slow_query_log_basic.result mysql-test/r/slow_query_log_file_basic.result mysql-test/r/slow_query_log_file_func.result mysql-test/r/slow_query_log_func.result mysql-test/r/sort_buffer_size_basic_32.result mysql-test/r/sort_buffer_size_basic_64.result mysql-test/r/sql_auto_is_null_basic.result mysql-test/r/sql_big_selects_basic.result mysql-test/r/sql_big_selects_func.result mysql-test/r/sql_big_tables_basic.result mysql-test/r/sql_big_tables_func.result mysql-test/r/sql_buffer_result_basic.result mysql-test/r/sql_buffer_result_func.result mysql-test/r/sql_log_bin_basic.result mysql-test/r/sql_log_off_basic.result mysql-test/r/sql_log_off_func.result mysql-test/r/sql_low_priority_updates_basic.result mysql-test/r/sql_low_priority_updates_func.result mysql-test/r/sql_max_join_size_func.result mysql-test/r/sql_mode_basic.result mysql-test/r/sql_mode_func.result mysql-test/r/sql_notes_basic.result mysql-test/r/sql_notes_func.result mysql-test/r/sql_quote_show_create_basic.result mysql-test/r/sql_quote_show_create_func.result mysql-test/r/sql_safe_updates_basic.result mysql-test/r/sql_safe_updates_func.result mysql-test/r/sql_select_limit_func.result mysql-test/r/sql_slave_skip_counter_basic.result mysql-test/r/sql_warnings_basic.result mysql-test/r/sql_warnings_func.result mysql-test/r/ssl_ca_basic.result mysql-test/r/ssl_capath_basic.result mysql-test/r/ssl_cert_basic.result mysql-test/r/ssl_cipher_basic.result mysql-test/r/ssl_key_basic.result mysql-test/r/status2.result mysql-test/r/storage_engine_basic.result mysql-test/r/sync_frm_basic.result mysql-test/r/system_time_zone_basic.result mysql-test/r/table_definition_cache_basic.result mysql-test/r/table_lock_wait_timeout_basic.result mysql-test/r/table_open_cache_basic.result mysql-test/r/thread_cache_size_func.result mysql-test/r/thread_handling_basic.result mysql-test/r/time_zone_basic.result mysql-test/r/time_zone_func.result mysql-test/r/timed_mutexes_basic.result mysql-test/r/timestamp_basic_32.result mysql-test/r/timestamp_basic_64.result mysql-test/r/timestamp_func.result mysql-test/r/tmp_table_size_basic_32.result mysql-test/r/tmp_table_size_basic_64.result mysql-test/r/tmpdir_basic.result mysql-test/r/transaction_alloc_block_size_basic_32.result mysql-test/r/transaction_alloc_block_size_basic_64.result mysql-test/r/transaction_prealloc_size_basic_32.result mysql-test/r/transaction_prealloc_size_basic_64.result mysql-test/r/tx_isolation_basic.result mysql-test/r/tx_isolation_func.result mysql-test/r/unique_checks_basic.result mysql-test/r/updatable_views_with_limit_basic.result mysql-test/r/updatable_views_with_limit_func.result mysql-test/r/version_basic.result mysql-test/r/version_comment_basic.result mysql-test/r/version_compile_machine_basic.result mysql-test/r/version_compile_os_basic.result mysql-test/r/wait_timeout_basic_32.result mysql-test/r/wait_timeout_basic_64.result mysql-test/r/wait_timeout_func.result mysql-test/r/warning_count_basic.result mysql-test/std_data/bug36055.MYD mysql-test/std_data/bug36055.MYI mysql-test/std_data/bug36055.frm mysql-test/std_data/charset_utf8.txt mysql-test/std_data/funcs_1/ mysql-test/std_data/funcs_1/load_file.txt mysql-test/std_data/numbers.txt mysql-test/suite/falcon/r/falcon_bug_25393.result mysql-test/suite/falcon/r/falcon_bug_33211.result mysql-test/suite/falcon/r/falcon_bug_33216.result mysql-test/suite/falcon/t/falcon_bug_25393.test mysql-test/suite/falcon/t/falcon_bug_33211.test mysql-test/suite/falcon/t/falcon_bug_33216.test mysql-test/suite/jp/include/ mysql-test/suite/jp/include/trim_sjis.inc mysql-test/suite/jp/t/disabled.def mysql-test/suite/jp/t/jp_enum_sjis-master.opt mysql-test/suite/jp/t/jp_enum_ucs2-master.opt mysql-test/suite/jp/t/jp_enum_ujis-master.opt mysql-test/suite/jp/t/jp_enum_utf8-master.opt mysql-test/suite/parts/inc/partition_alter1_1.inc mysql-test/suite/parts/inc/partition_alter1_1_2.inc mysql-test/suite/parts/inc/partition_alter1_2.inc mysql-test/suite/parts/inc/partition_auto_increment.inc mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result mysql-test/suite/parts/r/partition_alter1_1_innodb.result mysql-test/suite/parts/r/partition_alter1_1_myisam.result mysql-test/suite/parts/r/partition_alter1_1_ndb.result mysql-test/suite/parts/r/partition_alter1_2_innodb.result mysql-test/suite/parts/r/partition_alter1_2_myisam.result mysql-test/suite/parts/r/partition_alter1_2_ndb.result mysql-test/suite/parts/r/partition_auto_increment_falcon.result mysql-test/suite/parts/r/partition_auto_increment_innodb.result mysql-test/suite/parts/r/partition_auto_increment_myisam.result mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test mysql-test/suite/parts/t/partition_alter1_1_innodb.test mysql-test/suite/parts/t/partition_alter1_1_myisam.test mysql-test/suite/parts/t/partition_alter1_1_ndb.test mysql-test/suite/parts/t/partition_alter1_2_innodb.test mysql-test/suite/parts/t/partition_alter1_2_myisam.test mysql-test/suite/parts/t/partition_alter1_2_ndb.test mysql-test/suite/parts/t/partition_auto_increment_falcon.test mysql-test/suite/parts/t/partition_auto_increment_innodb.test mysql-test/suite/parts/t/partition_auto_increment_myisam.test mysql-test/t/auto_commit_basic.test mysql-test/t/auto_increment_increment_basic.test mysql-test/t/auto_increment_increment_func.test mysql-test/t/auto_increment_offset_basic.test mysql-test/t/auto_increment_offset_func.test mysql-test/t/autocommit_func-master.opt mysql-test/t/autocommit_func.test mysql-test/t/automatic_sp_privileges_basic.test mysql-test/t/automatic_sp_privileges_func.test mysql-test/t/backup_tablespace.test mysql-test/t/basedir_basic.test mysql-test/t/big_tables_basic.test mysql-test/t/binlog_cache_size_basic_32.test mysql-test/t/binlog_cache_size_basic_64.test mysql-test/t/binlog_format_basic.test mysql-test/t/bulk_insert_buffer_size_basic_32.test mysql-test/t/bulk_insert_buffer_size_basic_64.test mysql-test/t/character_set_client_basic.test mysql-test/t/character_set_client_func.test mysql-test/t/character_set_connection_basic.test mysql-test/t/character_set_connection_func.test mysql-test/t/character_set_database_basic.test mysql-test/t/character_set_database_func.test mysql-test/t/character_set_filesystem_basic.test mysql-test/t/character_set_filesystem_func-master.opt mysql-test/t/character_set_results_basic.test mysql-test/t/character_set_results_func.test mysql-test/t/character_set_server_basic.test mysql-test/t/character_set_server_func.test mysql-test/t/character_set_system_basic.test mysql-test/t/collation_connection_basic.test mysql-test/t/collation_connection_func.test mysql-test/t/collation_database_basic.test mysql-test/t/collation_database_func.test mysql-test/t/collation_server_basic.test mysql-test/t/collation_server_func.test mysql-test/t/completion_type_basic.test mysql-test/t/completion_type_func-master.opt mysql-test/t/completion_type_func.test mysql-test/t/concurrent_insert_basic.test mysql-test/t/concurrent_insert_func.test mysql-test/t/connect_timeout_basic.test mysql-test/t/datadir_basic.test mysql-test/t/default_week_format_basic.test mysql-test/t/default_week_format_func.test mysql-test/t/delay_key_write_basic.test mysql-test/t/delay_key_write_func-master.opt mysql-test/t/delay_key_write_func.test mysql-test/t/delayed_insert_limit_basic_32.test mysql-test/t/delayed_insert_limit_basic_64.test mysql-test/t/delayed_insert_limit_func.test mysql-test/t/delayed_insert_timeout_basic.test mysql-test/t/delayed_queue_size_basic_32.test mysql-test/t/delayed_queue_size_basic_64.test mysql-test/t/div_precision_increment_basic.test mysql-test/t/div_precision_increment_func.test mysql-test/t/engine_condition_pushdown_basic.test mysql-test/t/error_count_basic.test mysql-test/t/event_scheduler_basic.test mysql-test/t/event_scheduler_func.test mysql-test/t/events_embedded.test mysql-test/t/expire_logs_days_basic.test mysql-test/t/flush_basic.test mysql-test/t/foreign_key_checks_basic.test mysql-test/t/foreign_key_checks_func.test mysql-test/t/ft_boolean_syntax_basic.test mysql-test/t/ft_boolean_syntax_func.test mysql-test/t/func_rollback.test mysql-test/t/general_log_basic.test mysql-test/t/general_log_file_basic-master.opt mysql-test/t/general_log_file_basic.test mysql-test/t/general_log_file_func-master.opt mysql-test/t/general_log_file_func.test mysql-test/t/general_log_func.test mysql-test/t/grant4.test mysql-test/t/group_concat_max_len_basic.test mysql-test/t/group_concat_max_len_func.test mysql-test/t/have_compress_basic.test mysql-test/t/have_crypt_basic.test mysql-test/t/have_csv_basic.test mysql-test/t/have_dynamic_loading_basic.test mysql-test/t/have_geometry_basic.test mysql-test/t/have_innodb_basic.test mysql-test/t/have_ndbcluster_basic.test mysql-test/t/have_openssl_basic.test mysql-test/t/have_partitioning_basic.test mysql-test/t/have_query_cache_basic.test mysql-test/t/have_rtree_keys_basic.test mysql-test/t/have_ssl_basic.test mysql-test/t/have_symlink_basic.test mysql-test/t/hostname_basic.test mysql-test/t/identity_basic.test mysql-test/t/identity_func-master.opt mysql-test/t/identity_func.test mysql-test/t/init_connect_basic.test mysql-test/t/init_slave_basic.test mysql-test/t/innodb_additional_mem_pool_size_basic.test mysql-test/t/innodb_autoextend_increment_basic.test mysql-test/t/innodb_autoinc_lock_mode_basic.test mysql-test/t/innodb_autoinc_lock_mode_func-master.opt mysql-test/t/innodb_autoinc_lock_mode_func.test mysql-test/t/innodb_buffer_pool_size_basic.test mysql-test/t/innodb_checksums_basic.test mysql-test/t/innodb_commit_concurrency_basic.test mysql-test/t/innodb_concurrency_tickets_basic_32.test mysql-test/t/innodb_concurrency_tickets_basic_64.test mysql-test/t/innodb_data_file_path_basic.test mysql-test/t/innodb_data_home_dir_basic.test mysql-test/t/innodb_doublewrite_basic.test mysql-test/t/innodb_fast_shutdown_basic.test mysql-test/t/innodb_file_io_threads_basic.test mysql-test/t/innodb_file_per_table_basic.test mysql-test/t/innodb_flush_log_at_trx_commit_basic.test mysql-test/t/innodb_flush_method_basic.test mysql-test/t/innodb_force_recovery_basic.test mysql-test/t/innodb_lock_wait_timeout_basic.test mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test mysql-test/t/innodb_log_buffer_size_basic.test mysql-test/t/innodb_log_file_size_basic.test mysql-test/t/innodb_log_files_in_group_basic.test mysql-test/t/innodb_log_group_home_dir_basic.test mysql-test/t/innodb_max_dirty_pages_pct_basic.test mysql-test/t/innodb_max_dirty_pages_pct_func.test mysql-test/t/innodb_max_purge_lag_basic_32.test mysql-test/t/innodb_max_purge_lag_basic_64.test mysql-test/t/innodb_mirrored_log_groups_basic.test mysql-test/t/innodb_open_files_basic.test mysql-test/t/innodb_rollback_on_timeout_basic.test mysql-test/t/innodb_support_xa_basic.test mysql-test/t/innodb_support_xa_func.test mysql-test/t/innodb_sync_spin_loops_basic_32.test mysql-test/t/innodb_sync_spin_loops_basic_64.test mysql-test/t/innodb_table_locks_basic.test mysql-test/t/innodb_table_locks_func.test mysql-test/t/innodb_thread_concurrency_basic.test mysql-test/t/insert_id_basic.test mysql-test/t/insert_id_func.test mysql-test/t/interactive_timeout_basic.test mysql-test/t/interactive_timeout_func.test mysql-test/t/join_buffer_size_basic_32.test mysql-test/t/join_buffer_size_basic_64.test mysql-test/t/keep_files_on_create_basic.test mysql-test/t/key_buffer_size_basic_32.test mysql-test/t/key_buffer_size_basic_64.test mysql-test/t/key_buffer_size_func.test mysql-test/t/key_cache_age_threshold_basic_32.test mysql-test/t/key_cache_age_threshold_basic_64.test mysql-test/t/key_cache_block_size_basic_32.test mysql-test/t/key_cache_block_size_basic_64.test mysql-test/t/key_cache_division_limit_basic_32.test mysql-test/t/key_cache_division_limit_basic_64.test mysql-test/t/last_insert_id_func-master.opt mysql-test/t/last_insert_id_func.test mysql-test/t/lc_time_names_basic.test mysql-test/t/lc_time_names_func.test mysql-test/t/license_basic.test mysql-test/t/local_infile_basic.test mysql-test/t/local_infile_func.test mysql-test/t/log_basic.test mysql-test/t/log_bin_trust_function_creators_basic.test mysql-test/t/log_bin_trust_function_creators_func-master.opt mysql-test/t/log_bin_trust_function_creators_func.test mysql-test/t/log_output_basic.test mysql-test/t/log_output_func.test mysql-test/t/log_queries_not_using_indexes_basic.test mysql-test/t/log_warnings_basic_32.test mysql-test/t/log_warnings_basic_64.test mysql-test/t/long_query_time_basic.test mysql-test/t/low_priority_updates_basic.test mysql-test/t/lowercase_utf8-master.opt mysql-test/t/lowercase_utf8.test mysql-test/t/max_allowed_packet_basic.test mysql-test/t/max_allowed_packet_func.test mysql-test/t/max_binlog_cache_size_basic_32.test mysql-test/t/max_binlog_cache_size_basic_64.test mysql-test/t/max_binlog_cache_size_func-master.opt mysql-test/t/max_binlog_size_basic.test mysql-test/t/max_connect_errors_basic_32.test mysql-test/t/max_connect_errors_basic_64.test mysql-test/t/max_connections_basic.test mysql-test/t/max_delayed_threads_basic.test mysql-test/t/max_error_count_basic.test mysql-test/t/max_heap_table_size_basic_32.test mysql-test/t/max_heap_table_size_basic_64.test mysql-test/t/max_insert_delayed_threads_basic.test mysql-test/t/max_join_size_func.test mysql-test/t/max_length_for_sort_data_basic.test mysql-test/t/max_prepared_stmt_count_basic.test mysql-test/t/max_prepared_stmt_count_func.test mysql-test/t/max_relay_log_size_basic.test mysql-test/t/max_seeks_for_key_basic_32.test mysql-test/t/max_seeks_for_key_basic_64.test mysql-test/t/max_seeks_for_key_func.test mysql-test/t/max_sort_length_basic.test mysql-test/t/max_sort_length_func.test mysql-test/t/max_sp_recursion_depth_basic.test mysql-test/t/max_sp_recursion_depth_func.test mysql-test/t/max_tmp_tables_basic_32.test mysql-test/t/max_tmp_tables_basic_64.test mysql-test/t/max_user_connections_basic.test mysql-test/t/max_user_connections_func.test mysql-test/t/max_write_lock_count_basic_32.test mysql-test/t/max_write_lock_count_basic_64.test mysql-test/t/min_examined_row_limit_basic_32.test mysql-test/t/min_examined_row_limit_basic_64.test mysql-test/t/multi_update_tiny_hash-master.opt mysql-test/t/multi_update_tiny_hash.test mysql-test/t/myisam_data_pointer_size_basic.test mysql-test/t/myisam_data_pointer_size_func.test mysql-test/t/myisam_max_sort_file_size_basic_32.test mysql-test/t/myisam_max_sort_file_size_basic_64.test mysql-test/t/myisam_repair_threads_basic_32.test mysql-test/t/myisam_repair_threads_basic_64.test mysql-test/t/myisam_sort_buffer_size_basic_32.test mysql-test/t/myisam_sort_buffer_size_basic_64.test mysql-test/t/myisam_stats_method_basic.test mysql-test/t/myisam_stats_method_func.test mysql-test/t/myisam_use_mmap_basic.test mysql-test/t/ndb_log_update_as_write_basic.test mysql-test/t/ndb_log_updated_only_basic.test mysql-test/t/net_buffer_length_basic.test mysql-test/t/net_read_timeout_basic.test mysql-test/t/net_retry_count_basic_32.test mysql-test/t/net_retry_count_basic_64.test mysql-test/t/net_write_timeout_basic.test mysql-test/t/new_basic.test mysql-test/t/old_passwords_basic.test mysql-test/t/old_passwords_func.test mysql-test/t/optimizer_prune_level_basic.test mysql-test/t/optimizer_search_depth_basic.test mysql-test/t/preload_buffer_size_basic.test mysql-test/t/ps_ddl1.test mysql-test/t/query_alloc_block_size_basic_32.test mysql-test/t/query_alloc_block_size_basic_64.test mysql-test/t/query_cache_limit_basic_32.test mysql-test/t/query_cache_limit_basic_64.test mysql-test/t/query_cache_limit_func.test mysql-test/t/query_cache_min_res_unit_basic_32.test mysql-test/t/query_cache_min_res_unit_basic_64.test mysql-test/t/query_cache_size_basic_32.test mysql-test/t/query_cache_size_basic_64.test mysql-test/t/query_cache_type_basic.test mysql-test/t/query_cache_type_func.test mysql-test/t/query_cache_wlock_invalidate_basic.test mysql-test/t/query_cache_wlock_invalidate_func.test mysql-test/t/query_prealloc_size_basic_32.test mysql-test/t/query_prealloc_size_basic_64.test mysql-test/t/query_prealloc_size_func.test mysql-test/t/range_alloc_block_size_basic_32.test mysql-test/t/range_alloc_block_size_basic_64.test mysql-test/t/read_buffer_size_basic.test mysql-test/t/read_only_basic.test mysql-test/t/read_only_func.test mysql-test/t/read_rnd_buffer_size_basic.test mysql-test/t/relay_log_purge_basic.test mysql-test/t/rpl_init_slave_func-slave.opt mysql-test/t/rpl_init_slave_func.test mysql-test/t/rpl_max_binlog_size_func-master.opt mysql-test/t/rpl_max_binlog_size_func.test mysql-test/t/rpl_recovery_rank_basic_32.test mysql-test/t/rpl_recovery_rank_basic_64.test mysql-test/t/rpl_slave_allow_batching_basic.test mysql-test/t/rpl_slave_compressed_protocol_basic.test mysql-test/t/rpl_slave_exec_mode_basic.test mysql-test/t/rpl_slave_net_timeout_basic.test mysql-test/t/rpl_slave_transaction_retries_basic_32.test mysql-test/t/rpl_slave_transaction_retries_basic_64.test mysql-test/t/rpl_sync_binlog_basic_32.test mysql-test/t/rpl_sync_binlog_basic_64.test mysql-test/t/secure_auth_basic.test mysql-test/t/secure_auth_func-master.opt mysql-test/t/secure_auth_func.test mysql-test/t/server_id_basic_32.test mysql-test/t/server_id_basic_64.test mysql-test/t/slow_launch_time_basic.test mysql-test/t/slow_launch_time_func.test mysql-test/t/slow_query_log_basic.test mysql-test/t/slow_query_log_file_basic-master.opt mysql-test/t/slow_query_log_file_basic.test mysql-test/t/slow_query_log_file_func-master.opt mysql-test/t/slow_query_log_file_func.test mysql-test/t/slow_query_log_func.test mysql-test/t/sort_buffer_size_basic_32.test mysql-test/t/sort_buffer_size_basic_64.test mysql-test/t/sql_auto_is_null_basic.test mysql-test/t/sql_big_selects_basic.test mysql-test/t/sql_big_selects_func.test mysql-test/t/sql_big_tables_basic.test mysql-test/t/sql_big_tables_func.test mysql-test/t/sql_buffer_result_basic.test mysql-test/t/sql_buffer_result_func.test mysql-test/t/sql_log_bin_basic.test mysql-test/t/sql_log_off_basic.test mysql-test/t/sql_log_off_func.test mysql-test/t/sql_low_priority_updates_basic.test mysql-test/t/sql_low_priority_updates_func.test mysql-test/t/sql_max_join_size_func.test mysql-test/t/sql_mode_basic.test mysql-test/t/sql_mode_func.test mysql-test/t/sql_notes_basic.test mysql-test/t/sql_notes_func.test mysql-test/t/sql_quote_show_create_basic.test mysql-test/t/sql_quote_show_create_func.test mysql-test/t/sql_safe_updates_basic.test mysql-test/t/sql_safe_updates_func.test mysql-test/t/sql_select_limit_func.test mysql-test/t/sql_slave_skip_counter_basic.test mysql-test/t/sql_warnings_basic.test mysql-test/t/sql_warnings_func.test mysql-test/t/ssl_ca_basic.test mysql-test/t/ssl_capath_basic.test mysql-test/t/ssl_cert_basic.test mysql-test/t/ssl_cipher_basic.test mysql-test/t/ssl_key_basic.test mysql-test/t/status2.test mysql-test/t/storage_engine_basic-master.opt mysql-test/t/storage_engine_basic.test mysql-test/t/sync_frm_basic.test mysql-test/t/system_time_zone_basic.test mysql-test/t/table_definition_cache_basic.test mysql-test/t/table_lock_wait_timeout_basic.test mysql-test/t/table_open_cache_basic.test mysql-test/t/thread_cache_size_func.test mysql-test/t/thread_handling_basic.test mysql-test/t/time_zone_basic.test mysql-test/t/time_zone_func.test mysql-test/t/timed_mutexes_basic.test mysql-test/t/timestamp_basic_32.test mysql-test/t/timestamp_basic_64.test mysql-test/t/timestamp_func.test mysql-test/t/tmp_table_size_basic_32.test mysql-test/t/tmp_table_size_basic_64.test mysql-test/t/tmpdir_basic.test mysql-test/t/transaction_alloc_block_size_basic_32.test mysql-test/t/transaction_alloc_block_size_basic_64.test mysql-test/t/transaction_prealloc_size_basic_32.test mysql-test/t/transaction_prealloc_size_basic_64.test mysql-test/t/tx_isolation_basic.test mysql-test/t/tx_isolation_func-master.opt mysql-test/t/tx_isolation_func.test mysql-test/t/unique_checks_basic.test mysql-test/t/updatable_views_with_limit_basic.test mysql-test/t/updatable_views_with_limit_func.test mysql-test/t/version_basic.test mysql-test/t/version_comment_basic.test mysql-test/t/version_compile_machine_basic.test mysql-test/t/version_compile_os_basic.test mysql-test/t/wait_timeout_basic_32.test mysql-test/t/wait_timeout_basic_64.test mysql-test/t/wait_timeout_func.test mysql-test/t/warning_count_basic.test sql/event_parse_data.cc sql/event_parse_data.h storage/myisammrg/myrg_records.c win/create_def_file.js renamed: mysql-test/r/slave-running.result => mysql-test/r/rpl_slave-running.result mysql-test/r/slave-stopped.result => mysql-test/r/rpl_slave-stopped.result mysql-test/suite/funcs_1/data/innodb_tb1.txt => mysql-test/std_data/funcs_1/innodb_tb1.txt mysql-test/suite/funcs_1/data/innodb_tb2.txt => mysql-test/std_data/funcs_1/innodb_tb2.txt mysql-test/suite/funcs_1/data/innodb_tb3.txt => mysql-test/std_data/funcs_1/innodb_tb3.txt mysql-test/suite/funcs_1/data/innodb_tb4.txt => mysql-test/std_data/funcs_1/innodb_tb4.txt mysql-test/suite/funcs_1/data/memory_tb1.txt => mysql-test/std_data/funcs_1/memory_tb1.txt mysql-test/suite/funcs_1/data/memory_tb2.txt => mysql-test/std_data/funcs_1/memory_tb2.txt mysql-test/suite/funcs_1/data/memory_tb3.txt => mysql-test/std_data/funcs_1/memory_tb3.txt mysql-test/suite/funcs_1/data/memory_tb4.txt => mysql-test/std_data/funcs_1/memory_tb4.txt mysql-test/suite/funcs_1/data/myisam_tb1.txt => mysql-test/std_data/funcs_1/myisam_tb1.txt mysql-test/suite/funcs_1/data/myisam_tb2.txt => mysql-test/std_data/funcs_1/myisam_tb2.txt mysql-test/suite/funcs_1/data/myisam_tb3.txt => mysql-test/std_data/funcs_1/myisam_tb3.txt mysql-test/suite/funcs_1/data/myisam_tb4.txt => mysql-test/std_data/funcs_1/myisam_tb4.txt mysql-test/suite/funcs_1/data/ndb_tb1.txt => mysql-test/std_data/funcs_1/ndb_tb1.txt mysql-test/suite/funcs_1/data/ndb_tb2.txt => mysql-test/std_data/funcs_1/ndb_tb2.txt mysql-test/suite/funcs_1/data/ndb_tb3.txt => mysql-test/std_data/funcs_1/ndb_tb3.txt mysql-test/suite/funcs_1/data/ndb_tb4.txt => mysql-test/std_data/funcs_1/ndb_tb4.txt mysql-test/suite/funcs_1/data/t3.txt => mysql-test/std_data/funcs_1/t3.txt mysql-test/suite/funcs_1/data/t4.txt => mysql-test/std_data/funcs_1/t4.txt mysql-test/suite/funcs_1/data/t7.txt => mysql-test/std_data/funcs_1/t7.txt mysql-test/suite/funcs_1/data/t9.txt => mysql-test/std_data/funcs_1/t9.txt modified: .bzrignore BUILD/Makefile.am CMakeLists.txt Docs/Makefile.am Makefile.am client/CMakeLists.txt client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqldump.c client/mysqlimport.c client/mysqlslap.c client/mysqltest.c client/sql_string.cc client/sql_string.h config/ac-macros/libevent.m4 configure.in dbug/dbug.c extra/CMakeLists.txt extra/comp_err.c extra/libevent/Makefile.am extra/libevent/README extra/libevent/buffer.c extra/libevent/devpoll.c extra/libevent/epoll.c extra/libevent/evbuffer.c extra/libevent/evdns.c extra/libevent/evdns.h extra/libevent/event-internal.h extra/libevent/event.c extra/libevent/event.h extra/libevent/event_tagging.c extra/libevent/evhttp.h extra/libevent/evport.c extra/libevent/evsignal.h extra/libevent/http-internal.h extra/libevent/http.c extra/libevent/kqueue.c extra/libevent/log.c extra/libevent/log.h extra/libevent/poll.c extra/libevent/select.c extra/libevent/signal.c extra/replace.c extra/yassl/Makefile.am extra/yassl/taocrypt/Makefile.am include/config-win.h include/errmsg.h include/m_string.h include/my_alarm.h include/my_atomic.h include/my_base.h include/my_dbug.h include/my_global.h include/my_sys.h include/my_time.h include/myisammrg.h include/mysql_com.h include/violite.h libmysql/CMakeLists.txt libmysql/errmsg.c libmysql/libmysql.c libmysqld/CMakeLists.txt libmysqld/Makefile.am libmysqld/emb_qcache.cc libmysqld/examples/CMakeLists.txt libmysqld/lib_sql.cc libmysqld/libmysqld.c mysql-test/extra/rpl_tests/rpl_insert_id.test mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/include/have_falcon.inc mysql-test/include/master-slave-reset.inc mysql-test/include/mix1.inc mysql-test/include/rpl_events.inc mysql-test/include/wait_for_slave_to_start.inc mysql-test/include/wait_for_slave_to_stop.inc mysql-test/r/backup_errors.result mysql-test/r/backup_progress.result mysql-test/r/bigint.result mysql-test/r/client_xml.result mysql-test/r/comments.result mysql-test/r/create.result mysql-test/r/ctype_cp932_binlog_stm.result mysql-test/r/ctype_gbk.result mysql-test/r/ctype_utf8.result mysql-test/r/dirty_close.result mysql-test/r/distinct.result mysql-test/r/errors.result mysql-test/r/events_2.result mysql-test/r/events_scheduling.result mysql-test/r/func_concat.result mysql-test/r/func_gconcat.result mysql-test/r/func_math.result mysql-test/r/func_misc.result mysql-test/r/func_str.result mysql-test/r/grant.result mysql-test/r/grant2.result mysql-test/r/heap.result mysql-test/r/information_schema.result mysql-test/r/information_schema_db.result mysql-test/r/innodb.result mysql-test/r/innodb_mysql.result mysql-test/r/join_outer_innodb.result mysql-test/r/locktrans_innodb.result mysql-test/r/locktrans_myisam.result mysql-test/r/log_state.result mysql-test/r/merge.result mysql-test/r/mix2_myisam.result mysql-test/r/myisam.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysqlbinlog.result mysql-test/r/mysqldump.result mysql-test/r/mysqlshow.result mysql-test/r/mysqlslap.result mysql-test/r/mysqltest.result mysql-test/r/order_by.result mysql-test/r/parser.result mysql-test/r/ps.result mysql-test/r/ps_1general.result mysql-test/r/ps_ddl.result mysql-test/r/query_cache.result mysql-test/r/query_cache_debug.result mysql-test/r/query_cache_merge.result mysql-test/r/read_only_innodb.result mysql-test/r/repair.result mysql-test/r/sp-code.result mysql-test/r/sp-error.result mysql-test/r/sp-vars.result mysql-test/r/sp.result mysql-test/r/sp_trans_log.result mysql-test/r/status.result mysql-test/r/strict.result mysql-test/r/subselect.result mysql-test/r/subselect2.result mysql-test/r/subselect3.result mysql-test/r/subselect_mat.result mysql-test/r/subselect_no_mat.result mysql-test/r/subselect_no_opts.result mysql-test/r/subselect_no_semijoin.result mysql-test/r/subselect_notembedded.result mysql-test/r/subselect_sj.result mysql-test/r/subselect_sj2.result mysql-test/r/trigger.result mysql-test/r/type_binary.result mysql-test/r/type_blob.result mysql-test/r/type_decimal.result mysql-test/r/type_newdecimal.result mysql-test/r/type_ranges.result mysql-test/r/udf.result mysql-test/r/varbinary.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/r/view_grant.result mysql-test/r/warnings.result mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/t/binlog_innodb.test mysql-test/suite/binlog/t/disabled.def mysql-test/suite/falcon/r/falcon_bug_22168.result mysql-test/suite/falcon/r/falcon_bug_34890.result mysql-test/suite/falcon/t/disabled.def mysql-test/suite/falcon/t/falcon_bug_22168.test mysql-test/suite/falcon/t/falcon_bug_22175.test mysql-test/suite/falcon/t/falcon_bug_33041.test mysql-test/suite/falcon/t/falcon_bug_33662.test mysql-test/suite/falcon/t/falcon_bug_34164.test mysql-test/suite/falcon/t/falcon_bug_34890.test mysql-test/suite/federated/federated.result mysql-test/suite/federated/federated.test mysql-test/suite/federated/federated_bug_25714.result mysql-test/suite/federated/federated_bug_25714.test mysql-test/suite/funcs_1/README.txt mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc mysql-test/suite/funcs_1/datadict/datadict_load.inc mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/include/falcon_tb1.inc mysql-test/suite/funcs_1/include/falcon_tb2.inc mysql-test/suite/funcs_1/include/falcon_tb3.inc mysql-test/suite/funcs_1/include/falcon_tb4.inc mysql-test/suite/funcs_1/include/innodb_tb1.inc mysql-test/suite/funcs_1/include/innodb_tb2.inc mysql-test/suite/funcs_1/include/innodb_tb3.inc mysql-test/suite/funcs_1/include/innodb_tb4.inc mysql-test/suite/funcs_1/include/memory_tb1.inc mysql-test/suite/funcs_1/include/memory_tb2.inc mysql-test/suite/funcs_1/include/memory_tb3.inc mysql-test/suite/funcs_1/include/memory_tb4.inc mysql-test/suite/funcs_1/include/myisam_tb1.inc mysql-test/suite/funcs_1/include/myisam_tb2.inc mysql-test/suite/funcs_1/include/myisam_tb3.inc mysql-test/suite/funcs_1/include/myisam_tb4.inc mysql-test/suite/funcs_1/include/ndb_tb1.inc mysql-test/suite/funcs_1/include/ndb_tb2.inc mysql-test/suite/funcs_1/include/ndb_tb3.inc mysql-test/suite/funcs_1/include/ndb_tb4.inc mysql-test/suite/funcs_1/include/sp_tb.inc mysql-test/suite/funcs_1/r/charset_collation_3.result mysql-test/suite/funcs_1/r/falcon_func_view.result mysql-test/suite/funcs_1/r/falcon_storedproc.result mysql-test/suite/funcs_1/r/falcon_storedproc_02.result mysql-test/suite/funcs_1/r/falcon_storedproc_03.result mysql-test/suite/funcs_1/r/falcon_storedproc_06.result mysql-test/suite/funcs_1/r/falcon_storedproc_07.result mysql-test/suite/funcs_1/r/falcon_storedproc_08.result mysql-test/suite/funcs_1/r/falcon_storedproc_10.result mysql-test/suite/funcs_1/r/falcon_trig_0102.result mysql-test/suite/funcs_1/r/falcon_trig_03.result mysql-test/suite/funcs_1/r/falcon_trig_03e.result mysql-test/suite/funcs_1/r/falcon_trig_0407.result mysql-test/suite/funcs_1/r/falcon_trig_08.result mysql-test/suite/funcs_1/r/falcon_trig_09.result mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result mysql-test/suite/funcs_1/r/falcon_trig_frkey.result mysql-test/suite/funcs_1/r/falcon_views.result mysql-test/suite/funcs_1/r/innodb_func_view.result mysql-test/suite/funcs_1/r/innodb_storedproc.result mysql-test/suite/funcs_1/r/innodb_storedproc_02.result mysql-test/suite/funcs_1/r/innodb_storedproc_03.result mysql-test/suite/funcs_1/r/innodb_storedproc_06.result mysql-test/suite/funcs_1/r/innodb_storedproc_07.result mysql-test/suite/funcs_1/r/innodb_storedproc_08.result mysql-test/suite/funcs_1/r/innodb_storedproc_10.result mysql-test/suite/funcs_1/r/innodb_trig_0102.result mysql-test/suite/funcs_1/r/innodb_trig_03.result mysql-test/suite/funcs_1/r/innodb_trig_03e.result mysql-test/suite/funcs_1/r/innodb_trig_0407.result mysql-test/suite/funcs_1/r/innodb_trig_08.result mysql-test/suite/funcs_1/r/innodb_trig_09.result mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result mysql-test/suite/funcs_1/r/innodb_trig_frkey.result mysql-test/suite/funcs_1/r/innodb_views.result mysql-test/suite/funcs_1/r/is_columns_innodb.result mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_columns_is_falcon.result mysql-test/suite/funcs_1/r/is_columns_memory.result mysql-test/suite/funcs_1/r/is_columns_myisam.result mysql-test/suite/funcs_1/r/is_columns_ndb.result mysql-test/suite/funcs_1/r/is_tables_innodb.result mysql-test/suite/funcs_1/r/is_tables_is_falcon.result mysql-test/suite/funcs_1/r/is_tables_memory.result mysql-test/suite/funcs_1/r/is_tables_myisam.result mysql-test/suite/funcs_1/r/is_tables_ndb.result mysql-test/suite/funcs_1/r/memory_func_view.result mysql-test/suite/funcs_1/r/memory_storedproc.result mysql-test/suite/funcs_1/r/memory_storedproc_02.result mysql-test/suite/funcs_1/r/memory_storedproc_03.result mysql-test/suite/funcs_1/r/memory_storedproc_06.result mysql-test/suite/funcs_1/r/memory_storedproc_07.result mysql-test/suite/funcs_1/r/memory_storedproc_08.result mysql-test/suite/funcs_1/r/memory_storedproc_10.result mysql-test/suite/funcs_1/r/memory_trig_0102.result mysql-test/suite/funcs_1/r/memory_trig_03.result mysql-test/suite/funcs_1/r/memory_trig_03e.result mysql-test/suite/funcs_1/r/memory_trig_0407.result mysql-test/suite/funcs_1/r/memory_trig_08.result mysql-test/suite/funcs_1/r/memory_trig_09.result mysql-test/suite/funcs_1/r/memory_trig_1011ext.result mysql-test/suite/funcs_1/r/memory_views.result mysql-test/suite/funcs_1/r/myisam_func_view.result mysql-test/suite/funcs_1/r/myisam_storedproc.result mysql-test/suite/funcs_1/r/myisam_storedproc_02.result mysql-test/suite/funcs_1/r/myisam_storedproc_03.result mysql-test/suite/funcs_1/r/myisam_storedproc_06.result mysql-test/suite/funcs_1/r/myisam_storedproc_07.result mysql-test/suite/funcs_1/r/myisam_storedproc_08.result mysql-test/suite/funcs_1/r/myisam_storedproc_10.result mysql-test/suite/funcs_1/r/myisam_trig_0102.result mysql-test/suite/funcs_1/r/myisam_trig_03.result mysql-test/suite/funcs_1/r/myisam_trig_03e.result mysql-test/suite/funcs_1/r/myisam_trig_0407.result mysql-test/suite/funcs_1/r/myisam_trig_08.result mysql-test/suite/funcs_1/r/myisam_trig_09.result mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result mysql-test/suite/funcs_1/r/myisam_views.result mysql-test/suite/funcs_1/r/ndb_func_view.result mysql-test/suite/funcs_1/r/ndb_storedproc.result mysql-test/suite/funcs_1/r/ndb_storedproc_02.result mysql-test/suite/funcs_1/r/ndb_storedproc_03.result mysql-test/suite/funcs_1/r/ndb_storedproc_06.result mysql-test/suite/funcs_1/r/ndb_storedproc_07.result mysql-test/suite/funcs_1/r/ndb_storedproc_08.result mysql-test/suite/funcs_1/r/ndb_storedproc_10.result mysql-test/suite/funcs_1/r/ndb_trig_0102.result mysql-test/suite/funcs_1/r/ndb_trig_03.result mysql-test/suite/funcs_1/r/ndb_trig_03e.result mysql-test/suite/funcs_1/r/ndb_trig_0407.result mysql-test/suite/funcs_1/r/ndb_trig_08.result mysql-test/suite/funcs_1/r/ndb_trig_09.result mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result mysql-test/suite/funcs_1/r/ndb_views.result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc mysql-test/suite/funcs_1/storedproc/storedproc_02.inc mysql-test/suite/funcs_1/storedproc/storedproc_03.inc mysql-test/suite/funcs_1/storedproc/storedproc_06.inc mysql-test/suite/funcs_1/storedproc/storedproc_10.inc mysql-test/suite/funcs_1/storedproc/storedproc_master.inc mysql-test/suite/funcs_1/t/disabled.def mysql-test/suite/funcs_1/t/falcon_bitdata.test mysql-test/suite/funcs_1/t/innodb_trig_0407.test mysql-test/suite/funcs_1/t/is_basics_mixed.test mysql-test/suite/funcs_1/t/is_engines.test mysql-test/suite/funcs_1/t/memory_storedproc_02.test mysql-test/suite/funcs_1/t/memory_storedproc_03.test mysql-test/suite/funcs_1/t/memory_storedproc_06.test mysql-test/suite/funcs_1/t/memory_storedproc_07.test mysql-test/suite/funcs_1/t/memory_storedproc_08.test mysql-test/suite/funcs_1/t/memory_storedproc_10.test mysql-test/suite/funcs_1/t/myisam_storedproc_02.test mysql-test/suite/funcs_1/t/myisam_storedproc_03.test mysql-test/suite/funcs_1/t/myisam_storedproc_06.test mysql-test/suite/funcs_1/t/myisam_storedproc_07.test mysql-test/suite/funcs_1/t/myisam_storedproc_08.test mysql-test/suite/funcs_1/t/myisam_storedproc_10.test mysql-test/suite/funcs_1/t/ndb_trig_03.test mysql-test/suite/funcs_1/t/ndb_trig_08.test mysql-test/suite/funcs_1/t/ndb_views.test mysql-test/suite/funcs_1/t/suite.opt mysql-test/suite/funcs_1/triggers/trig_frkey2.inc mysql-test/suite/funcs_1/triggers/triggers_0102.inc mysql-test/suite/funcs_1/triggers/triggers_03.inc mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc mysql-test/suite/funcs_1/triggers/triggers_0407.inc mysql-test/suite/funcs_1/triggers/triggers_08.inc mysql-test/suite/funcs_1/triggers/triggers_09.inc mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc mysql-test/suite/funcs_1/views/func_view.inc mysql-test/suite/funcs_1/views/views_master.inc mysql-test/suite/jp/r/jp_alter_sjis.result mysql-test/suite/jp/r/jp_alter_ucs2.result mysql-test/suite/jp/r/jp_alter_ujis.result mysql-test/suite/jp/r/jp_alter_utf8.result mysql-test/suite/jp/r/jp_charlength_sjis.result mysql-test/suite/jp/r/jp_charlength_ucs2.result mysql-test/suite/jp/r/jp_charlength_ujis.result mysql-test/suite/jp/r/jp_charlength_utf8.result mysql-test/suite/jp/r/jp_charset_sjis.result mysql-test/suite/jp/r/jp_charset_ucs2.result mysql-test/suite/jp/r/jp_charset_ujis.result mysql-test/suite/jp/r/jp_charset_utf8.result mysql-test/suite/jp/r/jp_convert_sjis.result mysql-test/suite/jp/r/jp_convert_ucs2.result mysql-test/suite/jp/r/jp_convert_ujis.result mysql-test/suite/jp/r/jp_convert_utf8.result mysql-test/suite/jp/r/jp_create_db_sjis.result mysql-test/suite/jp/r/jp_create_db_ucs2.result mysql-test/suite/jp/r/jp_create_db_ujis.result mysql-test/suite/jp/r/jp_create_db_utf8.result mysql-test/suite/jp/r/jp_create_tbl_sjis.result mysql-test/suite/jp/r/jp_create_tbl_ucs2.result mysql-test/suite/jp/r/jp_create_tbl_ujis.result mysql-test/suite/jp/r/jp_create_tbl_utf8.result mysql-test/suite/jp/r/jp_enum_sjis.result mysql-test/suite/jp/r/jp_enum_ucs2.result mysql-test/suite/jp/r/jp_enum_ujis.result mysql-test/suite/jp/r/jp_enum_utf8.result mysql-test/suite/jp/r/jp_insert_sjis.result mysql-test/suite/jp/r/jp_insert_ucs2.result mysql-test/suite/jp/r/jp_insert_ujis.result mysql-test/suite/jp/r/jp_insert_utf8.result mysql-test/suite/jp/r/jp_instr_sjis.result mysql-test/suite/jp/r/jp_instr_ucs2.result mysql-test/suite/jp/r/jp_instr_ujis.result mysql-test/suite/jp/r/jp_instr_utf8.result mysql-test/suite/jp/r/jp_join_sjis.result mysql-test/suite/jp/r/jp_join_ucs2.result mysql-test/suite/jp/r/jp_join_ujis.result mysql-test/suite/jp/r/jp_join_utf8.result mysql-test/suite/jp/r/jp_left_sjis.result mysql-test/suite/jp/r/jp_left_ucs2.result mysql-test/suite/jp/r/jp_left_ujis.result mysql-test/suite/jp/r/jp_left_utf8.result mysql-test/suite/jp/r/jp_length_sjis.result mysql-test/suite/jp/r/jp_length_ucs2.result mysql-test/suite/jp/r/jp_length_ujis.result mysql-test/suite/jp/r/jp_length_utf8.result mysql-test/suite/jp/r/jp_like_sjis.result mysql-test/suite/jp/r/jp_like_ucs2.result mysql-test/suite/jp/r/jp_like_ujis.result mysql-test/suite/jp/r/jp_like_utf8.result mysql-test/suite/jp/r/jp_locate_sjis.result mysql-test/suite/jp/r/jp_locate_ucs2.result mysql-test/suite/jp/r/jp_locate_ujis.result mysql-test/suite/jp/r/jp_locate_utf8.result mysql-test/suite/jp/r/jp_lpad_sjis.result mysql-test/suite/jp/r/jp_lpad_ucs2.result mysql-test/suite/jp/r/jp_lpad_ujis.result mysql-test/suite/jp/r/jp_lpad_utf8.result mysql-test/suite/jp/r/jp_ltrim_sjis.result mysql-test/suite/jp/r/jp_ltrim_ucs2.result mysql-test/suite/jp/r/jp_ltrim_ujis.result mysql-test/suite/jp/r/jp_ltrim_utf8.result mysql-test/suite/jp/r/jp_ps_sjis.result mysql-test/suite/jp/r/jp_ps_ujis.result mysql-test/suite/jp/r/jp_replace_sjis.result mysql-test/suite/jp/r/jp_replace_ucs2.result mysql-test/suite/jp/r/jp_replace_ujis.result mysql-test/suite/jp/r/jp_replace_utf8.result mysql-test/suite/jp/r/jp_reverse_sjis.result mysql-test/suite/jp/r/jp_reverse_ucs2.result mysql-test/suite/jp/r/jp_reverse_ujis.result mysql-test/suite/jp/r/jp_reverse_utf8.result mysql-test/suite/jp/r/jp_right_sjis.result mysql-test/suite/jp/r/jp_right_ucs2.result mysql-test/suite/jp/r/jp_right_ujis.result mysql-test/suite/jp/r/jp_right_utf8.result mysql-test/suite/jp/r/jp_rpad_sjis.result mysql-test/suite/jp/r/jp_rpad_ucs2.result mysql-test/suite/jp/r/jp_rpad_ujis.result mysql-test/suite/jp/r/jp_rpad_utf8.result mysql-test/suite/jp/r/jp_rtrim_sjis.result mysql-test/suite/jp/r/jp_rtrim_ucs2.result mysql-test/suite/jp/r/jp_rtrim_ujis.result mysql-test/suite/jp/r/jp_rtrim_utf8.result mysql-test/suite/jp/r/jp_select_sjis.result mysql-test/suite/jp/r/jp_select_ucs2.result mysql-test/suite/jp/r/jp_select_ujis.result mysql-test/suite/jp/r/jp_select_utf8.result mysql-test/suite/jp/r/jp_subquery_sjis.result mysql-test/suite/jp/r/jp_subquery_ucs2.result mysql-test/suite/jp/r/jp_subquery_ujis.result mysql-test/suite/jp/r/jp_subquery_utf8.result mysql-test/suite/jp/r/jp_substring_sjis.result mysql-test/suite/jp/r/jp_substring_ucs2.result mysql-test/suite/jp/r/jp_substring_ujis.result mysql-test/suite/jp/r/jp_substring_utf8.result mysql-test/suite/jp/r/jp_trim_sjis.result mysql-test/suite/jp/r/jp_trim_ucs2.result mysql-test/suite/jp/r/jp_trim_ujis.result mysql-test/suite/jp/r/jp_trim_utf8.result mysql-test/suite/jp/r/jp_union_ujis.result mysql-test/suite/jp/r/jp_update_sjis.result mysql-test/suite/jp/r/jp_update_ucs2.result mysql-test/suite/jp/r/jp_update_ujis.result mysql-test/suite/jp/r/jp_update_utf8.result mysql-test/suite/jp/r/jp_where_sjis.result mysql-test/suite/jp/r/jp_where_ucs2.result mysql-test/suite/jp/r/jp_where_ujis.result mysql-test/suite/jp/r/jp_where_utf8.result mysql-test/suite/jp/t/jp_alter_sjis.test mysql-test/suite/jp/t/jp_alter_ucs2.test mysql-test/suite/jp/t/jp_alter_ujis.test mysql-test/suite/jp/t/jp_alter_utf8.test mysql-test/suite/jp/t/jp_charlength_sjis.test mysql-test/suite/jp/t/jp_charlength_ucs2.test mysql-test/suite/jp/t/jp_charlength_ujis.test mysql-test/suite/jp/t/jp_charlength_utf8.test mysql-test/suite/jp/t/jp_charset_sjis.test mysql-test/suite/jp/t/jp_charset_ucs2.test mysql-test/suite/jp/t/jp_charset_ujis.test mysql-test/suite/jp/t/jp_charset_utf8.test mysql-test/suite/jp/t/jp_convert_sjis.test mysql-test/suite/jp/t/jp_convert_ucs2.test mysql-test/suite/jp/t/jp_convert_ujis.test mysql-test/suite/jp/t/jp_convert_utf8.test mysql-test/suite/jp/t/jp_create_db_sjis.test mysql-test/suite/jp/t/jp_create_db_utf8.test mysql-test/suite/jp/t/jp_create_tbl_sjis.test mysql-test/suite/jp/t/jp_create_tbl_ucs2.test mysql-test/suite/jp/t/jp_create_tbl_ujis.test mysql-test/suite/jp/t/jp_create_tbl_utf8.test mysql-test/suite/jp/t/jp_enum_sjis.test mysql-test/suite/jp/t/jp_enum_ucs2.test mysql-test/suite/jp/t/jp_enum_ujis.test mysql-test/suite/jp/t/jp_enum_utf8.test mysql-test/suite/jp/t/jp_insert_sjis.test mysql-test/suite/jp/t/jp_insert_ucs2.test mysql-test/suite/jp/t/jp_insert_ujis.test mysql-test/suite/jp/t/jp_insert_utf8.test mysql-test/suite/jp/t/jp_instr_sjis.test mysql-test/suite/jp/t/jp_instr_ucs2.test mysql-test/suite/jp/t/jp_instr_ujis.test mysql-test/suite/jp/t/jp_instr_utf8.test mysql-test/suite/jp/t/jp_join_sjis.test mysql-test/suite/jp/t/jp_join_ucs2.test mysql-test/suite/jp/t/jp_join_ujis.test mysql-test/suite/jp/t/jp_join_utf8.test mysql-test/suite/jp/t/jp_left_sjis.test mysql-test/suite/jp/t/jp_left_ucs2.test mysql-test/suite/jp/t/jp_left_ujis.test mysql-test/suite/jp/t/jp_left_utf8.test mysql-test/suite/jp/t/jp_length_sjis.test mysql-test/suite/jp/t/jp_length_ucs2.test mysql-test/suite/jp/t/jp_length_ujis.test mysql-test/suite/jp/t/jp_length_utf8.test mysql-test/suite/jp/t/jp_like_sjis.test mysql-test/suite/jp/t/jp_like_ucs2.test mysql-test/suite/jp/t/jp_like_ujis.test mysql-test/suite/jp/t/jp_like_utf8.test mysql-test/suite/jp/t/jp_locate_sjis.test mysql-test/suite/jp/t/jp_locate_ucs2.test mysql-test/suite/jp/t/jp_locate_ujis.test mysql-test/suite/jp/t/jp_locate_utf8.test mysql-test/suite/jp/t/jp_lpad_sjis.test mysql-test/suite/jp/t/jp_lpad_ucs2.test mysql-test/suite/jp/t/jp_lpad_ujis.test mysql-test/suite/jp/t/jp_lpad_utf8.test mysql-test/suite/jp/t/jp_ltrim_sjis.test mysql-test/suite/jp/t/jp_ltrim_ucs2.test mysql-test/suite/jp/t/jp_ltrim_ujis.test mysql-test/suite/jp/t/jp_ltrim_utf8.test mysql-test/suite/jp/t/jp_ps_sjis.test mysql-test/suite/jp/t/jp_ps_ujis.test mysql-test/suite/jp/t/jp_replace_sjis.test mysql-test/suite/jp/t/jp_replace_ucs2.test mysql-test/suite/jp/t/jp_replace_ujis.test mysql-test/suite/jp/t/jp_replace_utf8.test mysql-test/suite/jp/t/jp_reverse_sjis.test mysql-test/suite/jp/t/jp_reverse_ucs2.test mysql-test/suite/jp/t/jp_reverse_ujis.test mysql-test/suite/jp/t/jp_reverse_utf8.test mysql-test/suite/jp/t/jp_right_sjis.test mysql-test/suite/jp/t/jp_right_ucs2.test mysql-test/suite/jp/t/jp_right_ujis.test mysql-test/suite/jp/t/jp_right_utf8.test mysql-test/suite/jp/t/jp_rpad_sjis.test mysql-test/suite/jp/t/jp_rpad_ucs2.test mysql-test/suite/jp/t/jp_rpad_ujis.test mysql-test/suite/jp/t/jp_rpad_utf8.test mysql-test/suite/jp/t/jp_rtrim_sjis.test mysql-test/suite/jp/t/jp_rtrim_ucs2.test mysql-test/suite/jp/t/jp_rtrim_ujis.test mysql-test/suite/jp/t/jp_rtrim_utf8.test mysql-test/suite/jp/t/jp_select_sjis.test mysql-test/suite/jp/t/jp_select_ucs2.test mysql-test/suite/jp/t/jp_select_ujis.test mysql-test/suite/jp/t/jp_select_utf8.test mysql-test/suite/jp/t/jp_subquery_sjis.test mysql-test/suite/jp/t/jp_subquery_ucs2.test mysql-test/suite/jp/t/jp_subquery_ujis.test mysql-test/suite/jp/t/jp_subquery_utf8.test mysql-test/suite/jp/t/jp_substring_sjis.test mysql-test/suite/jp/t/jp_substring_ucs2.test mysql-test/suite/jp/t/jp_substring_ujis.test mysql-test/suite/jp/t/jp_substring_utf8.test mysql-test/suite/jp/t/jp_trim_sjis.test mysql-test/suite/jp/t/jp_trim_ucs2.test mysql-test/suite/jp/t/jp_trim_ujis.test mysql-test/suite/jp/t/jp_trim_utf8.test mysql-test/suite/jp/t/jp_union_ujis.test mysql-test/suite/jp/t/jp_update_sjis.test mysql-test/suite/jp/t/jp_update_ucs2.test mysql-test/suite/jp/t/jp_update_ujis.test mysql-test/suite/jp/t/jp_update_utf8.test mysql-test/suite/jp/t/jp_where_sjis.test mysql-test/suite/jp/t/jp_where_ucs2.test mysql-test/suite/jp/t/jp_where_ujis.test mysql-test/suite/jp/t/jp_where_utf8.test mysql-test/suite/ndb/r/ndb_alter_table_online.result mysql-test/suite/ndb/t/ndb_alter_table_online.test mysql-test/suite/ndb/t/ndb_alter_table_online2.test mysql-test/suite/parts/inc/partition_layout_check1.inc mysql-test/suite/parts/inc/partition_layout_check2.inc mysql-test/suite/parts/t/disabled.def mysql-test/suite/rpl/r/rpl_events.result mysql-test/suite/rpl/r/rpl_found_rows.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_insert_id.result mysql-test/suite/rpl/r/rpl_locktrans_myisam.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_row_until.result mysql-test/suite/rpl/r/rpl_slave_status.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/rpl/r/rpl_view.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_found_rows.test mysql-test/suite/rpl/t/rpl_innodb_bug28430.test mysql-test/suite/rpl/t/rpl_insert.test mysql-test/suite/rpl/t/rpl_insert_id.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_row_create_table.test mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test mysql-test/suite/rpl/t/rpl_server_id1.test mysql-test/suite/rpl/t/rpl_slave_status.test mysql-test/suite/rpl/t/rpl_sp.test mysql-test/suite/rpl/t/rpl_view.test mysql-test/t/backup_errors.test mysql-test/t/backup_fkey.test mysql-test/t/backup_no_data.test mysql-test/t/backup_objects.test mysql-test/t/backup_progress.test mysql-test/t/client_xml.test mysql-test/t/create.test mysql-test/t/ctype_gbk.test mysql-test/t/ctype_utf8.test mysql-test/t/dirty_close.test mysql-test/t/disabled.def mysql-test/t/errors.test mysql-test/t/events_2.test mysql-test/t/events_scheduling.test mysql-test/t/events_trans.test mysql-test/t/func_concat.test mysql-test/t/func_gconcat.test mysql-test/t/func_math.test mysql-test/t/func_misc.test mysql-test/t/grant.test mysql-test/t/information_schema.test mysql-test/t/information_schema_db.test mysql-test/t/innodb_mysql.test mysql-test/t/log_state.test mysql-test/t/merge.test mysql-test/t/myisam.test mysql-test/t/mysqldump.test mysql-test/t/mysqlshow.test mysql-test/t/mysqlslap.test mysql-test/t/mysqltest.test mysql-test/t/order_by.test mysql-test/t/outfile.test mysql-test/t/parser.test mysql-test/t/ps.test mysql-test/t/ps_1general.test mysql-test/t/ps_ddl.test mysql-test/t/query_cache.test mysql-test/t/query_cache_debug.test mysql-test/t/query_cache_merge.test mysql-test/t/read_only_innodb.test mysql-test/t/repair.test mysql-test/t/sp-error.test mysql-test/t/sp.test mysql-test/t/sp_trans_log.test mysql-test/t/status.test mysql-test/t/subselect.test mysql-test/t/subselect2.test mysql-test/t/subselect3.test mysql-test/t/subselect_mat.test mysql-test/t/subselect_notembedded.test mysql-test/t/subselect_sj.test mysql-test/t/subselect_sj2.test mysql-test/t/trigger.test mysql-test/t/type_blob.test mysql-test/t/type_decimal.test mysql-test/t/udf.test mysql-test/t/varbinary.test mysql-test/t/variables.test mysql-test/t/view_grant.test mysql-test/valgrind.supp mysys/hash.c mysys/list.c mysys/mf_iocache.c mysys/mf_iocache2.c mysys/mf_keycache.c mysys/mf_keycaches.c mysys/mf_loadpath.c mysys/mf_path.c mysys/my_alloc.c mysys/my_append.c mysys/my_clock.c mysys/my_compress.c mysys/my_copy.c mysys/my_error.c mysys/my_fopen.c mysys/my_fstream.c mysys/my_gethwaddr.c mysys/my_getwd.c mysys/my_handler_errors.h mysys/my_lib.c mysys/my_lock.c mysys/my_lockmem.c mysys/my_malloc.c mysys/my_messnc.c mysys/my_open.c mysys/my_pread.c mysys/my_pthread.c mysys/my_read.c mysys/my_realloc.c mysys/my_redel.c mysys/my_seek.c mysys/my_static.c mysys/my_winthread.c mysys/my_write.c mysys/safemalloc.c mysys/thr_alarm.c mysys/thr_lock.c mysys/tree.c mysys/typelib.c plugin/audit_null/audit_null.c scripts/make_binary_distribution.sh scripts/mysql_system_tables_fix.sql sql-common/client.c sql-common/my_time.c sql/CMakeLists.txt sql/Makefile.am sql/backup/CMakeLists.txt sql/backup/backup_kernel.h sql/backup/backup_progress.cc sql/backup/backup_progress.h sql/backup/be_snapshot.cc sql/backup/catalog.cc sql/backup/catalog.h sql/backup/data_backup.cc sql/backup/error.h sql/backup/kernel.cc sql/backup/stream_v1.c sql/backup/stream_v1.h sql/derror.cc sql/des_key_file.cc sql/discover.cc sql/event_data_objects.cc sql/event_data_objects.h sql/event_db_repository.cc sql/event_queue.cc sql/event_scheduler.cc sql/events.cc sql/field.cc sql/field.h sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_partition.cc sql/ha_partition.h sql/handler.cc sql/handler.h sql/hostname.cc sql/init.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_subselect.h sql/item_sum.cc sql/lock.cc sql/log.cc sql/log_event.cc sql/log_event_old.cc sql/my_decimal.cc sql/my_decimal.h sql/mysql_priv.h sql/mysqld.cc sql/opt_range.cc sql/opt_range.h sql/opt_sum.cc sql/parse_file.cc sql/protocol.cc sql/records.cc sql/rpl_record.cc sql/rpl_rli.cc sql/rpl_tblmap.cc sql/scheduler.cc sql/scheduler.h sql/set_var.cc sql/set_var.h sql/share/charsets/README sql/share/errmsg.txt sql/si_objects.cc sql/si_objects.h sql/slave.cc sql/sp.cc sql/sp.h sql/sp_head.cc sql/sp_head.h sql/sp_pcontext.cc sql/sql_acl.cc sql/sql_acl.h sql/sql_base.cc sql/sql_binlog.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_cursor.cc sql/sql_db.cc sql/sql_delete.cc sql/sql_handler.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_map.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_prepare.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_servers.cc sql/sql_show.cc sql/sql_string.cc sql/sql_string.h sql/sql_table.cc sql/sql_tablespace.cc sql/sql_test.cc sql/sql_trigger.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/stacktrace.c sql/table.cc sql/table.h sql/thr_malloc.cc sql/tztime.cc sql/udf_example.c sql/uniques.cc sql/unireg.cc sql/unireg.h storage/archive/azio.c storage/archive/concurrency_test.c storage/archive/ha_archive.cc storage/blackhole/ha_blackhole.cc storage/csv/ha_tina.cc storage/csv/transparent_file.cc storage/example/ha_example.cc storage/falcon/BDB.cpp storage/falcon/BDB.h storage/falcon/CMakeLists.txt storage/falcon/Cache.cpp storage/falcon/Cache.h storage/falcon/CmdGen.cpp storage/falcon/Database.cpp storage/falcon/Database.h storage/falcon/Dbb.cpp storage/falcon/Dbb.h storage/falcon/DeferredIndex.cpp storage/falcon/Engine.h storage/falcon/Error.cpp storage/falcon/Gopher.cpp storage/falcon/IO.cpp storage/falcon/IOx.h storage/falcon/ImageManager.cpp storage/falcon/Index2Page.cpp storage/falcon/Index2RootPage.cpp storage/falcon/IndexPage.cpp storage/falcon/IndexPage.h storage/falcon/IndexRootPage.cpp storage/falcon/IndexRootPage.h storage/falcon/Interlock.h storage/falcon/JString.cpp storage/falcon/Log.cpp storage/falcon/PagePrecedence.cpp storage/falcon/PagePrecedence.h storage/falcon/PrettyPrint.cpp storage/falcon/Record.cpp storage/falcon/Record.h storage/falcon/RecordLeaf.cpp storage/falcon/RecordLocatorPage.cpp storage/falcon/RecordScavenge.cpp storage/falcon/RecordScavenge.h storage/falcon/RecordVersion.cpp storage/falcon/RecordVersion.h storage/falcon/RepositoryVolume.cpp storage/falcon/SQLError.cpp storage/falcon/SQLParse.cpp storage/falcon/SRLCreateTableSpace.cpp storage/falcon/SRLCreateTableSpace.h storage/falcon/SRLIndexPage.cpp storage/falcon/SRLUpdateBlob.cpp storage/falcon/SRLUpdateIndex.cpp storage/falcon/SRLUpdateRecords.cpp storage/falcon/SRLVersion.h storage/falcon/Scan.cpp storage/falcon/Section.cpp storage/falcon/SerialLog.cpp storage/falcon/SerialLogRecord.cpp storage/falcon/Statement.cpp storage/falcon/StorageDatabase.cpp storage/falcon/StorageDatabase.h storage/falcon/StorageHandler.cpp storage/falcon/StorageHandler.h storage/falcon/StorageVersion.h storage/falcon/Stream.cpp storage/falcon/SyncObject.cpp storage/falcon/SyncObject.h storage/falcon/Synchronize.cpp storage/falcon/Synchronize.h storage/falcon/Table.cpp storage/falcon/Table.h storage/falcon/TableAttachment.cpp storage/falcon/TableSpace.cpp storage/falcon/TableSpace.h storage/falcon/TableSpaceManager.cpp storage/falcon/TableSpaceManager.h storage/falcon/Transaction.cpp storage/falcon/Validation.cpp storage/falcon/ha_falcon.cpp storage/falcon/ha_falcon.h storage/falcon/nodes.h storage/federated/ha_federated.cc storage/heap/_check.c storage/heap/hp_clear.c storage/heap/hp_create.c storage/heap/hp_delete.c storage/heap/hp_hash.c storage/heap/hp_open.c storage/heap/hp_rkey.c storage/heap/hp_rrnd.c storage/heap/hp_test1.c storage/heap/hp_test2.c storage/heap/hp_write.c storage/innobase/CMakeLists.txt storage/innobase/handler/ha_innodb.cc storage/myisam/CMakeLists.txt storage/myisam/ft_eval.c storage/myisam/ha_myisam.cc storage/myisam/mi_changed.c storage/myisam/mi_check.c storage/myisam/mi_close.c storage/myisam/mi_create.c storage/myisam/mi_dbug.c storage/myisam/mi_delete.c storage/myisam/mi_delete_all.c storage/myisam/mi_dynrec.c storage/myisam/mi_info.c storage/myisam/mi_keycache.c storage/myisam/mi_locking.c storage/myisam/mi_log.c storage/myisam/mi_open.c storage/myisam/mi_packrec.c storage/myisam/mi_panic.c storage/myisam/mi_rkey.c storage/myisam/mi_rsame.c storage/myisam/mi_search.c storage/myisam/mi_statrec.c storage/myisam/mi_test1.c storage/myisam/mi_test2.c storage/myisam/mi_test3.c storage/myisam/mi_update.c storage/myisam/mi_write.c storage/myisam/myisamchk.c storage/myisam/myisamlog.c storage/myisam/myisampack.c storage/myisam/sort.c storage/myisammrg/CMakeLists.txt storage/myisammrg/Makefile.am storage/myisammrg/ha_myisammrg.cc storage/myisammrg/ha_myisammrg.h storage/myisammrg/myrg_close.c storage/myisammrg/myrg_create.c storage/myisammrg/myrg_open.c storage/ndb/include/kernel/signaldata/DictTabInfo.hpp strings/CHARSET_INFO.txt strings/dtoa.c strings/longlong2str.c strings/longlong2str_asm.c strings/my_vsnprintf.c strings/str_test.c support-files/build-tags support-files/mysql.spec.sh tests/CMakeLists.txt tests/mysql_client_test.c tests/thread_test.c unittest/mysys/CMakeLists.txt vio/vio_priv.h vio/viosocket.c vio/viossl.c vio/viosslfactories.c zlib/zutil.h === modified file 'mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test' --- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test 2008-03-28 17:56:43 +0000 +++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test 2008-06-04 18:14:44 +0000 @@ -293,8 +293,18 @@ insert delayed into t2 values(rand()); set @a=2.345; insert delayed into t2 values(@a); -let $wait_condition= SELECT COUNT(*) = 19 FROM t2; +# With INSERT DELAYED, rows are written to the binlog after they are +# written to the table. Therefore, it is not enough to wait until the +# rows make it to t2 on the master (the rows may not be in the binlog +# at that time, and may still not be in the binlog when +# sync_slave_with_master is later called). Instead, we wait until the +# rows make it to t2 on the slave. We first call +# sync_slave_with_master, so that we are sure that t2 has been created +# on the slave. +sync_slave_with_master; +let $wait_condition= SELECT COUNT(*) = 19 FROM mysqltest1.t2; --source include/wait_condition.inc +connection master; # If you want to do manual testing of the mixed mode regarding UDFs (not # testable automatically as quite platform- and compiler-dependent),