2684 Tomas Ulin 2008-09-02
merge correction
modified:
mysql-test/suite/rpl/r/rpl_heartbeat.result
mysql-test/suite/rpl/r/rpl_server_id1.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result
2683 Tomas Ulin 2008-09-02 [merge]
merge
removed:
mysql-test/include/binlog_cache_size_basic.inc
mysql-test/include/bulk_insert_buffer_size_basic.inc
mysql-test/include/delayed_insert_limit_basic.inc
mysql-test/include/delayed_queue_size_basic.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/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/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/multi_range_count_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_timeout_basic.inc
mysql-test/r/binlog_cache_size_basic_32.result
mysql-test/r/binlog_cache_size_basic_64.result
mysql-test/r/bulk_insert_buffer_size_basic_32.result
mysql-test/r/bulk_insert_buffer_size_basic_64.result
mysql-test/r/concurrent_innodb.result
mysql-test/r/delayed_insert_limit_basic_32.result
mysql-test/r/delayed_insert_limit_basic_64.result
mysql-test/r/delayed_queue_size_basic_32.result
mysql-test/r/delayed_queue_size_basic_64.result
mysql-test/r/innodb_concurrency_tickets_basic_32.result
mysql-test/r/innodb_concurrency_tickets_basic_64.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_sync_spin_loops_basic_32.result
mysql-test/r/innodb_sync_spin_loops_basic_64.result
mysql-test/r/join_buffer_size_basic_32.result
mysql-test/r/join_buffer_size_basic_64.result
mysql-test/r/key_buffer_size_basic_32.result
mysql-test/r/key_buffer_size_basic_64.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/log_warnings_basic_32.result
mysql-test/r/log_warnings_basic_64.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_connect_errors_basic_32.result
mysql-test/r/max_connect_errors_basic_64.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_seeks_for_key_basic_32.result
mysql-test/r/max_seeks_for_key_basic_64.result
mysql-test/r/max_tmp_tables_basic_32.result
mysql-test/r/max_tmp_tables_basic_64.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_range_count_basic_32.result
mysql-test/r/multi_range_count_basic_64.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_32.result
mysql-test/r/myisam_sort_buffer_size_basic_64.result
mysql-test/r/net_retry_count_basic_32.result
mysql-test/r/net_retry_count_basic_64.result
mysql-test/r/parser.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_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_prealloc_size_basic_32.result
mysql-test/r/query_prealloc_size_basic_64.result
mysql-test/r/range_alloc_block_size_basic_32.result
mysql-test/r/range_alloc_block_size_basic_64.result
mysql-test/r/rpl_recovery_rank_basic_32.result
mysql-test/r/rpl_recovery_rank_basic_64.result
mysql-test/r/server_id_basic_32.result
mysql-test/r/server_id_basic_64.result
mysql-test/r/slave_transaction_retries_basic_32.result
mysql-test/r/slave_transaction_retries_basic_64.result
mysql-test/r/sort_buffer_size_basic_32.result
mysql-test/r/sort_buffer_size_basic_64.result
mysql-test/r/sync_binlog_basic_32.result
mysql-test/r/sync_binlog_basic_64.result
mysql-test/r/timestamp_basic_32.result
mysql-test/r/timestamp_basic_64.result
mysql-test/r/tmp_table_size_basic_32.result
mysql-test/r/tmp_table_size_basic_64.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/wait_timeout_basic_32.result
mysql-test/r/wait_timeout_basic_64.result
mysql-test/suite/parts/r/ndb_blob_partition.result
mysql-test/suite/parts/r/ndb_partition_error.result
mysql-test/suite/parts/r/ndb_partition_key.result
mysql-test/suite/parts/r/ndb_partition_list.result
mysql-test/suite/parts/r/ndb_partition_range.result
mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
mysql-test/suite/parts/t/ndb_blob_partition.test
mysql-test/suite/parts/t/ndb_partition_error.test
mysql-test/suite/parts/t/ndb_partition_key.test
mysql-test/suite/parts/t/ndb_partition_list.test
mysql-test/suite/parts/t/ndb_partition_range.test
mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
mysql-test/t/binlog_cache_size_basic_32.test
mysql-test/t/binlog_cache_size_basic_64.test
mysql-test/t/bulk_insert_buffer_size_basic_32.test
mysql-test/t/bulk_insert_buffer_size_basic_64.test
mysql-test/t/concurrent_innodb-master.opt
mysql-test/t/concurrent_innodb.test
mysql-test/t/delayed_insert_limit_basic_32.test
mysql-test/t/delayed_insert_limit_basic_64.test
mysql-test/t/delayed_queue_size_basic_32.test
mysql-test/t/delayed_queue_size_basic_64.test
mysql-test/t/innodb_concurrency_tickets_basic_32.test
mysql-test/t/innodb_concurrency_tickets_basic_64.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_sync_spin_loops_basic_32.test
mysql-test/t/innodb_sync_spin_loops_basic_64.test
mysql-test/t/join_buffer_size_basic_32.test
mysql-test/t/join_buffer_size_basic_64.test
mysql-test/t/key_buffer_size_basic_32.test
mysql-test/t/key_buffer_size_basic_64.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/log_warnings_basic_32.test
mysql-test/t/log_warnings_basic_64.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_connect_errors_basic_32.test
mysql-test/t/max_connect_errors_basic_64.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_seeks_for_key_basic_32.test
mysql-test/t/max_seeks_for_key_basic_64.test
mysql-test/t/max_tmp_tables_basic_32.test
mysql-test/t/max_tmp_tables_basic_64.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_range_count_basic_32.test
mysql-test/t/multi_range_count_basic_64.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/net_retry_count_basic_32.test
mysql-test/t/net_retry_count_basic_64.test
mysql-test/t/parser.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_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_prealloc_size_basic_32.test
mysql-test/t/query_prealloc_size_basic_64.test
mysql-test/t/range_alloc_block_size_basic_32.test
mysql-test/t/range_alloc_block_size_basic_64.test
mysql-test/t/rpl_recovery_rank_basic_32.test
mysql-test/t/rpl_recovery_rank_basic_64.test
mysql-test/t/server_id_basic_32.test
mysql-test/t/server_id_basic_64.test
mysql-test/t/slave_transaction_retries_basic_32.test
mysql-test/t/slave_transaction_retries_basic_64.test
mysql-test/t/sort_buffer_size_basic_32.test
mysql-test/t/sort_buffer_size_basic_64.test
mysql-test/t/sync_binlog_basic_32.test
mysql-test/t/sync_binlog_basic_64.test
mysql-test/t/timestamp_basic_32.test
mysql-test/t/timestamp_basic_64.test
mysql-test/t/tmp_table_size_basic_32.test
mysql-test/t/tmp_table_size_basic_64.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/wait_timeout_basic_32.test
mysql-test/t/wait_timeout_basic_64.test
added:
BUILD/compile-pentium-valgrind-max-no-ndb
mysql-test/include/have_case_insensitive_file_system.inc
mysql-test/include/have_lowercase2.inc
mysql-test/include/mysqlbinlog_row_engine.inc
mysql-test/include/ps_ddl_1.inc
mysql-test/include/wait_condition.inc
mysql-test/include/wait_for_slave_sql_error_and_skip.inc
mysql-test/r/case_insensitive_file_system.require
mysql-test/r/concurrent_innodb_safelog.result
mysql-test/r/concurrent_innodb_unsafelog.result
mysql-test/r/innodb-autoinc-optimize.result
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb_bug34300.result
mysql-test/r/innodb_bug35220.result
mysql-test/r/mysqlbinlog_row.result
mysql-test/r/mysqlbinlog_row_big.result
mysql-test/r/mysqlbinlog_row_innodb.result
mysql-test/r/mysqlbinlog_row_myisam.result
mysql-test/r/mysqlbinlog_row_trans.result
mysql-test/r/parser.result
mysql-test/r/parser_stack.result
mysql-test/r/subselect_debug.result
mysql-test/std_data/corrupt_t1#P#p1.MYI
mysql-test/std_data/corrupt_t1.MYI
mysql-test/std_data/parts/t1_will_crash#P#p1_first_1024.MYD
mysql-test/std_data/parts/t1_will_crash#P#p2.MYD
mysql-test/std_data/parts/t1_will_crash#P#p2.MYI
mysql-test/std_data/parts/t1_will_crash#P#p3.MYI
mysql-test/std_data/parts/t1_will_crash#P#p4.MYI
mysql-test/std_data/parts/t1_will_crash#P#p6.MYD
mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD
mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD
mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_schemata.inc
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
mysql-test/suite/funcs_1/datadict/tables.inc
mysql-test/suite/funcs_1/include/bug28309_skip.inc
mysql-test/suite/funcs_1/include/tb3.inc
mysql-test/suite/funcs_1/r/is_cml_innodb.result
mysql-test/suite/funcs_1/r/is_cml_memory.result
mysql-test/suite/funcs_1/r/is_cml_myisam.result
mysql-test/suite/funcs_1/r/is_cml_ndb.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
mysql-test/suite/funcs_1/r/is_routines_embedded.result
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_tables_embedded.result
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
mysql-test/suite/funcs_1/r/is_views_embedded.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_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/t/is_cml_innodb.test
mysql-test/suite/funcs_1/t/is_cml_memory.test
mysql-test/suite/funcs_1/t/is_cml_myisam.test
mysql-test/suite/funcs_1/t/is_cml_ndb.test
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
mysql-test/suite/funcs_1/t/is_routines_embedded.test
mysql-test/suite/funcs_1/t/is_schemata_embedded.test
mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_tables_embedded.test
mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_triggers_embedded.test
mysql-test/suite/funcs_1/t/is_views_embedded.test
mysql-test/suite/funcs_1/t/ndb_trig_0102.test
mysql-test/suite/funcs_1/t/ndb_trig_03.test
mysql-test/suite/funcs_1/t/ndb_trig_0407.test
mysql-test/suite/funcs_1/t/ndb_trig_08.test
mysql-test/suite/funcs_1/t/ndb_trig_09.test
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
mysql-test/suite/parts/inc/partition_mgm.inc
mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
mysql-test/suite/parts/r/partition_recover_myisam.result
mysql-test/suite/parts/r/partition_repair_myisam.result
mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test
mysql-test/suite/parts/t/partition_mgm_lc0_memory.test
mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test
mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_archive.test
mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test
mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_memory.test
mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_myisam.test
mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc2_archive-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_archive.test
mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test
mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_memory.test
mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test
mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test
mysql-test/suite/parts/t/partition_recover_myisam-master.opt
mysql-test/suite/parts/t/partition_recover_myisam.test
mysql-test/suite/parts/t/partition_repair_myisam.test
mysql-test/suite/parts/t/partition_special_innodb-master.opt
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
mysql-test/suite/rpl/r/rpl_plugin_load.result
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
mysql-test/suite/rpl/t/rpl_plugin_load.test
mysql-test/suite/sys_vars/
mysql-test/suite/sys_vars/README
mysql-test/suite/sys_vars/inc/
mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc
mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc
mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc
mysql-test/suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc
mysql-test/suite/sys_vars/inc/innodb_max_purge_lag_basic.inc
mysql-test/suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc
mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc
mysql-test/suite/sys_vars/inc/key_cache_block_size_basic.inc
mysql-test/suite/sys_vars/inc/key_cache_division_limit_basic.inc
mysql-test/suite/sys_vars/inc/log_warnings_basic.inc
mysql-test/suite/sys_vars/inc/max_binlog_cache_size_basic.inc
mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc
mysql-test/suite/sys_vars/inc/max_heap_table_size_basic.inc
mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc
mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc
mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc
mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc
mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc
mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc
mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc
mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc
mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
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/range_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc
mysql-test/suite/sys_vars/inc/server_id_basic.inc
mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc
mysql-test/suite/sys_vars/inc/timestamp_basic.inc
mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
mysql-test/suite/sys_vars/inc/wait_timeout_basic.inc
mysql-test/suite/sys_vars/r/
mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result
mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result
mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_32.result
mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_64.result
mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_32.result
mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_64.result
mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_32.result
mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_64.result
mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result
mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result
mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result
mysql-test/suite/sys_vars/r/key_cache_block_size_basic_64.result
mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_32.result
mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result
mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result
mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
mysql-test/suite/sys_vars/r/max_heap_table_size_basic_32.result
mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result
mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result
mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result
mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result
mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result
mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result
mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result
mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result
mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result
mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result
mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.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/query_prealloc_size_basic_64.result
mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
mysql-test/suite/sys_vars/r/server_id_basic_32.result
mysql-test/suite/sys_vars/r/server_id_basic_64.result
mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result
mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/sync_binlog_basic_32.result
mysql-test/suite/sys_vars/r/sync_binlog_basic_64.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/tmp_table_size_basic_32.result
mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
mysql-test/suite/sys_vars/r/wait_timeout_basic_32.result
mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result
mysql-test/suite/sys_vars/t/
mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_32.test
mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic_64.test
mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_32.test
mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic_64.test
mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_32.test
mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic_64.test
mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
mysql-test/suite/sys_vars/t/key_buffer_size_basic_32.test
mysql-test/suite/sys_vars/t/key_buffer_size_basic_64.test
mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
mysql-test/suite/sys_vars/t/key_cache_block_size_basic_32.test
mysql-test/suite/sys_vars/t/key_cache_block_size_basic_64.test
mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_32.test
mysql-test/suite/sys_vars/t/key_cache_division_limit_basic_64.test
mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_32.test
mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic_64.test
mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
mysql-test/suite/sys_vars/t/max_heap_table_size_basic_32.test
mysql-test/suite/sys_vars/t/max_heap_table_size_basic_64.test
mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
mysql-test/suite/sys_vars/t/query_prealloc_size_basic_32.test
mysql-test/suite/sys_vars/t/query_prealloc_size_basic_64.test
mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
mysql-test/suite/sys_vars/t/server_id_basic_32.test
mysql-test/suite/sys_vars/t/server_id_basic_64.test
mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
mysql-test/suite/sys_vars/t/sync_binlog_basic_32.test
mysql-test/suite/sys_vars/t/sync_binlog_basic_64.test
mysql-test/suite/sys_vars/t/timestamp_basic_32.test
mysql-test/suite/sys_vars/t/timestamp_basic_64.test
mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
mysql-test/suite/sys_vars/t/wait_timeout_basic_32.test
mysql-test/suite/sys_vars/t/wait_timeout_basic_64.test
mysql-test/t/concurrent_innodb_safelog-master.opt
mysql-test/t/concurrent_innodb_safelog.test
mysql-test/t/concurrent_innodb_unsafelog-master.opt
mysql-test/t/concurrent_innodb_unsafelog.test
mysql-test/t/innodb-autoinc-optimize.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_bug35220.test
mysql-test/t/mysqlbinlog_row.test
mysql-test/t/mysqlbinlog_row_big.test
mysql-test/t/mysqlbinlog_row_innodb.test
mysql-test/t/mysqlbinlog_row_myisam.test
mysql-test/t/mysqlbinlog_row_trans.test
mysql-test/t/parser.test
mysql-test/t/parser_stack.test
mysql-test/t/subselect_debug.test
renamed:
mysql-test/include/wait_condition.inc => mysql-test/include/wait_condition.inc.moved
mysql-test/suite/funcs_1/r/ndb_trig_0102.result => mysql-test/suite/funcs_1/r/ndb_trig_0102.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_03.result => mysql-test/suite/funcs_1/r/ndb_trig_03.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_0407.result => mysql-test/suite/funcs_1/r/ndb_trig_0407.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_08.result => mysql-test/suite/funcs_1/r/ndb_trig_08.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_09.result => mysql-test/suite/funcs_1/r/ndb_trig_09.result.moved
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result => mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result.moved
mysql-test/suite/funcs_1/t/ndb_trig_0102.test => mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_03.test => mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_0407.test => mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_08.test => mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_09.test => mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test => mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved
sql/stacktrace.c => mysys/stacktrace.c
sql/stacktrace.h => include/my_stacktrace.h
modified:
.bzrignore
BUILD/check-cpu
Makefile.am
client/CMakeLists.txt
client/Makefile.am
client/mysql.cc
client/mysql_upgrade.c
client/mysqlbinlog.cc
client/mysqltest.c
config/ac-macros/character_sets.m4
configure.in
include/Makefile.am
include/my_sys.h
include/myisam.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/emb_qcache.cc
libmysqld/lib_sql.cc
mysql-test/Makefile.am
mysql-test/extra/binlog_tests/binlog_insert_delayed.test
mysql-test/extra/binlog_tests/database.test
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/concurrent.inc
mysql-test/include/have_big5.inc
mysql-test/include/have_binlog_format_mixed.inc
mysql-test/include/have_binlog_format_mixed_or_row.inc
mysql-test/include/have_binlog_format_mixed_or_statement.inc
mysql-test/include/have_binlog_format_row.inc
mysql-test/include/have_binlog_format_row_or_statement.inc
mysql-test/include/have_binlog_format_statement.inc
mysql-test/include/have_bug25714.inc
mysql-test/include/have_case_sensitive_file_system.inc
mysql-test/include/have_community_features.inc
mysql-test/include/have_compress.inc
mysql-test/include/have_cp1250_ch.inc
mysql-test/include/have_cp932.inc
mysql-test/include/have_crypt.inc
mysql-test/include/have_debug.inc
mysql-test/include/have_eucjpms.inc
mysql-test/include/have_euckr.inc
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_gb2312.inc
mysql-test/include/have_gbk.inc
mysql-test/include/have_geometry.inc
mysql-test/include/have_latin2_ch.inc
mysql-test/include/have_log_bin.inc
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_ndbapi_examples.inc
mysql-test/include/have_outfile.inc
mysql-test/include/have_partition.inc
mysql-test/include/have_query_cache.inc
mysql-test/include/have_sjis.inc
mysql-test/include/have_ssl.inc
mysql-test/include/have_symlink.inc
mysql-test/include/have_tis620.inc
mysql-test/include/have_ucs2.inc
mysql-test/include/have_udf.inc
mysql-test/include/have_ujis.inc
mysql-test/include/mix1.inc
mysql-test/include/show_binlog_events.inc
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/client_xml.result
mysql-test/r/comments.result
mysql-test/r/csv.result
mysql-test/r/federated.result
mysql-test/r/func_if.result
mysql-test/r/func_in.result
mysql-test/r/func_misc.result
mysql-test/r/func_regexp.result
mysql-test/r/group_min_max.result
mysql-test/r/group_min_max_innodb.result
mysql-test/r/handler_innodb.result
mysql-test/r/innodb-replace.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/join.result
mysql-test/r/lowercase0.require
mysql-test/r/max_user_connections_func.result
mysql-test/r/metadata.result
mysql-test/r/multi_update.result
mysql-test/r/myisam.result
mysql-test/r/mysqltest.result
mysql-test/r/partition.result
mysql-test/r/partition_hash.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_range.result
mysql-test/r/partition_symlink.result
mysql-test/r/ps.result
mysql-test/r/ps_1general.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/ps_ddl.result
mysql-test/r/ps_ddl1.result
mysql-test/r/query_cache_merge.result
mysql-test/r/show_check.result
mysql-test/r/sp-error.result
mysql-test/r/sp.result
mysql-test/r/subselect.result
mysql-test/r/subselect3.result
mysql-test/r/symlink.result
mysql-test/r/trigger-trans.result
mysql-test/r/type_bit.result
mysql-test/r/type_newdecimal.result
mysql-test/suite/binlog/r/binlog_database.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_killed_simulate.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/funcs_1/datadict/charset_collation.inc
mysql-test/suite/funcs_1/datadict/columns.inc
mysql-test/suite/funcs_1/datadict/processlist_val.inc
mysql-test/suite/funcs_1/datadict/tables1.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/include/innodb_tb1.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_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc
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_trig_0102.result
mysql-test/suite/funcs_1/r/innodb_trig_03.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/is_columns_innodb.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_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.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_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/memory_bitdata.result
mysql-test/suite/funcs_1/r/memory_cursors.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_bitdata.result
mysql-test/suite/funcs_1/r/myisam_cursors.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_storedproc.result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.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/storedproc_02.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/charset_collation_1.test
mysql-test/suite/funcs_1/t/charset_collation_3.test
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_trig_03.test
mysql-test/suite/funcs_1/t/innodb_trig_03e.test
mysql-test/suite/funcs_1/t/innodb_trig_0407.test
mysql-test/suite/funcs_1/t/innodb_trig_08.test
mysql-test/suite/funcs_1/t/innodb_trig_09.test
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
mysql-test/suite/funcs_1/t/is_basics_mixed.test
mysql-test/suite/funcs_1/t/is_character_sets.test
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
mysql-test/suite/funcs_1/t/is_collations.test
mysql-test/suite/funcs_1/t/is_column_privileges.test
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_columns_innodb.test
mysql-test/suite/funcs_1/t/is_columns_is.test
mysql-test/suite/funcs_1/t/is_columns_memory.test
mysql-test/suite/funcs_1/t/is_columns_myisam.test
mysql-test/suite/funcs_1/t/is_columns_mysql.test
mysql-test/suite/funcs_1/t/is_columns_ndb.test
mysql-test/suite/funcs_1/t/is_engines.test
mysql-test/suite/funcs_1/t/is_events.test
mysql-test/suite/funcs_1/t/is_key_column_usage.test
mysql-test/suite/funcs_1/t/is_routines.test
mysql-test/suite/funcs_1/t/is_schema_privileges.test
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_schemata.test
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_statistics.test
mysql-test/suite/funcs_1/t/is_statistics_mysql.test
mysql-test/suite/funcs_1/t/is_table_constraints.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
mysql-test/suite/funcs_1/t/is_table_privileges.test
mysql-test/suite/funcs_1/t/is_tables.test
mysql-test/suite/funcs_1/t/is_tables_innodb.test
mysql-test/suite/funcs_1/t/is_tables_memory.test
mysql-test/suite/funcs_1/t/is_tables_myisam.test
mysql-test/suite/funcs_1/t/is_tables_mysql.test
mysql-test/suite/funcs_1/t/is_tables_ndb.test
mysql-test/suite/funcs_1/t/is_triggers.test
mysql-test/suite/funcs_1/t/is_user_privileges.test
mysql-test/suite/funcs_1/t/is_views.test
mysql-test/suite/funcs_1/t/memory_bitdata.test
mysql-test/suite/funcs_1/t/memory_cursors.test
mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_storedproc.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/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_03.test
mysql-test/suite/funcs_1/t/memory_trig_03e.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_08.test
mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam_cursors.test
mysql-test/suite/funcs_1/t/myisam_func_view.test
mysql-test/suite/funcs_1/t/myisam_storedproc.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/myisam_trig_0102.test
mysql-test/suite/funcs_1/t/myisam_trig_03.test
mysql-test/suite/funcs_1/t/myisam_trig_03e.test
mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_08.test
mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
mysql-test/suite/funcs_1/t/myisam_views.test
mysql-test/suite/funcs_1/t/ndb_storedproc.test
mysql-test/suite/funcs_1/t/ndb_trig_03e.test
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test
mysql-test/suite/funcs_1/t/processlist_priv_ps.test
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test
mysql-test/suite/funcs_1/t/processlist_val_ps.test
mysql-test/suite/funcs_1/triggers/trig_frkey.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_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/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
mysql-test/suite/jp/t/disabled.def
mysql-test/suite/ndb/r/ndb_partition_key.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/ndb_partition_key.test
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
mysql-test/suite/parts/inc/partition_alter4.inc
mysql-test/suite/parts/inc/partition_alter_11.inc
mysql-test/suite/parts/inc/partition_bigint.inc
mysql-test/suite/parts/inc/partition_check_drop.inc
mysql-test/suite/parts/inc/partition_int.inc
mysql-test/suite/parts/inc/partition_layout.inc
mysql-test/suite/parts/inc/partition_layout_check1.inc
mysql-test/suite/parts/inc/partition_layout_check2.inc
mysql-test/suite/parts/inc/partition_mediumint.inc
mysql-test/suite/parts/inc/partition_smallint.inc
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
mysql-test/suite/parts/inc/partition_tinyint.inc
mysql-test/suite/parts/r/ndb_dd_backuprestore.result
mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
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_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_myisam.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_alter2_innodb.result
mysql-test/suite/parts/r/partition_alter2_myisam.result
mysql-test/suite/parts/r/partition_alter3_innodb.result
mysql-test/suite/parts/r/partition_alter3_myisam.result
mysql-test/suite/parts/r/partition_alter4_innodb.result
mysql-test/suite/parts/r/partition_alter4_myisam.result
mysql-test/suite/parts/r/partition_basic_innodb.result
mysql-test/suite/parts/r/partition_basic_myisam.result
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
mysql-test/suite/parts/r/partition_engine_innodb.result
mysql-test/suite/parts/r/partition_engine_myisam.result
mysql-test/suite/parts/r/partition_engine_ndb.result
mysql-test/suite/parts/r/partition_int_innodb.result
mysql-test/suite/parts/r/partition_int_myisam.result
mysql-test/suite/parts/r/partition_int_ndb.result
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/r/partition_syntax_myisam.result
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/parts/t/ndb_dd_backuprestore.test
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test
mysql-test/suite/parts/t/partition_alter1_1_ndb.test
mysql-test/suite/parts/t/partition_alter1_2_ndb.test
mysql-test/suite/parts/t/partition_alter2_ndb.test
mysql-test/suite/parts/t/partition_basic_ndb.test
mysql-test/suite/parts/t/partition_bit_ndb.test
mysql-test/suite/parts/t/partition_engine_ndb.test
mysql-test/suite/parts/t/partition_int_ndb.test
mysql-test/suite/parts/t/partition_special_innodb.test
mysql-test/suite/parts/t/partition_syntax_ndb.test
mysql-test/suite/parts/t/partition_value_ndb.test
mysql-test/suite/rpl/r/rpl_failed_optimize.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
mysql-test/suite/rpl/r/rpl_loaddata_map.result
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/suite/rpl/r/rpl_server_id1.result
mysql-test/suite/rpl/r/rpl_slave_status.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/r/rpl_variables.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_incident.test
mysql-test/suite/rpl/t/rpl_loaddata_map.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_switch_stm_row_mixed.test
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/suite/rpl/t/rpl_trunc_temp.test
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test
mysql-test/suite/rpl/t/rpl_variables.test
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
mysql-test/t/alter_table.test
mysql-test/t/client_xml.test
mysql-test/t/csv.test
mysql-test/t/disabled.def
mysql-test/t/federated.test
mysql-test/t/func_if.test
mysql-test/t/func_in.test
mysql-test/t/func_misc.test
mysql-test/t/func_regexp.test
mysql-test/t/group_min_max.test
mysql-test/t/group_min_max_innodb.test
mysql-test/t/innodb-replace.test
mysql-test/t/innodb.test
mysql-test/t/join.test
mysql-test/t/lowercase_table3.test
mysql-test/t/max_user_connections_func.test
mysql-test/t/merge.test
mysql-test/t/myisam.test
mysql-test/t/mysql_delimiter.sql
mysql-test/t/mysqltest.test
mysql-test/t/partition.test
mysql-test/t/partition_hash.test
mysql-test/t/partition_symlink.test
mysql-test/t/ps_ddl.test
mysql-test/t/ps_ddl1.test
mysql-test/t/query_cache_merge.test
mysql-test/t/show_check.test
mysql-test/t/sp-error.test
mysql-test/t/sp.test
mysql-test/t/sql_low_priority_updates_func.test
mysql-test/t/status.test
mysql-test/t/subselect.test
mysql-test/t/subselect3.test
mysql-test/t/symlink.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysql-test/t/type_bit.test
mysql-test/t/type_newdecimal.test
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/default.c
mysys/errors.c
mysys/mf_pack.c
mysys/my_static.c
mysys/my_static.h
mysys/my_symlink.c
mysys/safemalloc.c
mysys/thr_lock.c
netware/BUILD/compile-linux-tools
netware/BUILD/nwbootstrap
netware/Makefile.am
netware/mysql_install_db.c
sql/CMakeLists.txt
sql/Makefile.am
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/events.cc
sql/field.h
sql/filesort.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_strfunc.cc
sql/item_subselect.cc
sql/log.cc
sql/log_event.cc
sql/log_event.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/opt_range.h
sql/protocol.cc
sql/records.cc
sql/rpl_tblmap.cc
sql/rpl_tblmap.h
sql/rpl_utility.h
sql/share/charsets/README
sql/share/errmsg.txt
sql/sp.cc
sql/sp_cache.cc
sql/sp_cache.h
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/thr_malloc.cc
storage/csv/ha_tina.cc
storage/federated/ha_federated.cc
storage/innobase/buf/buf0buf.c
storage/innobase/ha/ha0ha.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/buf0buf.h
storage/innobase/include/mach0data.h
storage/innobase/include/mach0data.ic
storage/innobase/include/srv0srv.h
storage/innobase/lock/lock0lock.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0srv.c
storage/myisam/mi_check.c
storage/myisam/mi_create.c
storage/myisam/mi_open.c
storage/myisam/mi_static.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/rt_index.c
strings/CHARSET_INFO.txt
strings/decimal.c
support-files/build-tags
support-files/my-huge.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
tests/mysql_client_test.c
mysys/stacktrace.c
include/my_stacktrace.h
=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result 2008-08-09 08:58:48 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result 2008-09-02 19:02:57 +0000
@@ -11,13 +11,13 @@ Variable_name Slave_heartbeat_period
Value 5.000
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
Warnings:
-Warning 1615 The requested value for the heartbeat period is less than 1 msec. The period is reset to zero which means no heartbeats will be sending
+Warning 1616 The requested value for the heartbeat period is less than 1 msec. The period is reset to zero which means no heartbeats will be sending
show status like 'Slave_heartbeat_period';;
Variable_name Slave_heartbeat_period
Value 0.000
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
Warnings:
-Warning 1615 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+Warning 1616 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
show status like 'Slave_heartbeat_period';;
Variable_name Slave_heartbeat_period
Value 4294967.000
@@ -29,7 +29,7 @@ reset slave;
set @@global.slave_net_timeout= 5;
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
Warnings:
-Warning 1615 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+Warning 1616 The requested value for the heartbeat period exceeds the value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
show status like 'Slave_heartbeat_period';;
Variable_name Slave_heartbeat_period
Value 5.001
@@ -41,7 +41,7 @@ Variable_name Slave_heartbeat_period
Value 4.000
set @@global.slave_net_timeout= 3 /* must be a warning */;
Warnings:
-Warning 1615 The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+Warning 1616 The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
reset slave;
drop table if exists t1;
set @@global.slave_net_timeout= 10;
=== modified file 'mysql-test/suite/rpl/r/rpl_server_id1.result'
--- a/mysql-test/suite/rpl/r/rpl_server_id1.result 2008-09-02 16:31:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_id1.result 2008-09-02 19:02:57 +0000
@@ -10,4 +10,4 @@ change master to master_port=SLAVE_PORT;
start slave;
*** must be having the replicate-same-server-id IO thread error ***
Slave_IO_Errno= 1593
-Slave_IO_Error= Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).
+Slave_IO_Error= The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result 2008-08-09 08:58:48 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result 2008-09-02 19:02:57 +0000
@@ -6,29 +6,29 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
start slave;
create table t1 (a int key, X int) engine ndb;
Warnings:
-Error 1616 Bad schema for mysql.ndb_replication table. Message: Wrong number of primary key parts, expected 3
+Error 1617 Bad schema for mysql.ndb_replication table. Message: Wrong number of primary key parts, expected 3
drop table t1;
insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$X(X)");
create table t1 (a int key, X int) engine ndb;
Warnings:
-Error 1617 Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
+Error 1618 Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
drop table t1;
delete from mysql.ndb_replication;
insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX(X)");
create table t1 (a int key, X int) engine ndb;
Warnings:
-Error 1617 Error in parsing conflict function. Message: column 'X' has wrong datatype
+Error 1618 Error in parsing conflict function. Message: column 'X' has wrong datatype
drop table t1;
delete from mysql.ndb_replication;
insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX()");
create table t1 (a int key, X int) engine ndb;
Warnings:
-Error 1617 Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
+Error 1618 Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
drop table t1;
delete from mysql.ndb_replication;
insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX(X Y)");
create table t1 (a int key, X int) engine ndb;
Warnings:
-Error 1617 Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
+Error 1618 Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
drop table t1;
delete from mysql.ndb_replication;
| Thread |
|---|
| • bzr push into mysql-5.1 branch (tomas.ulin:2683 to 2684) | Tomas Ulin | 3 Sep |
