Alexander Nozdrin b3018e8613 Manual merge from mysql-trunk-merge. ... Conflicts: - client/mysql.cc - client/mysqldump.c - configure.in - mysql-test/r/csv.result - mysql-test/r/func_time.result - mysql-test/r/show_check.result - mysql-test/r/sp-error.result - mysql-test/r/sp.result - mysql-test/r/sp_trans.result - mysql-test/r/type_blob.result - mysql-test/r/type_timestamp.result - mysql-test/r/warnings.result - mysql-test/suite/rpl/r/rpl_sp.result - sql/mysql_priv.h - sql/mysqld.cc - sql/sp.cc - sql/sql_base.cc - sql/sql_table.cc - sql/sql_trigger.cc - sql/sql_view.cc - sql/table.h - sql/share/errmsg.txt - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result		2010-02-24 16:52:27 +03:00
..
disabled.def	Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with	2010-02-12 12:04:57 +08:00
rpl000010-slave.opt
rpl000010.test
rpl000011.test
rpl000013.test
rpl000017-slave.sh
rpl000017.test
rpl_000015-slave.opt
rpl_000015.cnf
rpl_000015.test
rpl_alter.test
rpl_alter_db.test
rpl_auto_increment-master.opt
rpl_auto_increment.test
rpl_auto_increment_11932.test
rpl_auto_increment_update_failure.test
rpl_begin_commit_rollback-slave.opt
rpl_begin_commit_rollback.test	Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.	2010-02-02 10:56:42 +03:00
rpl_binlog_auto_inc_bug33029-master.opt	Bug#48308.	2010-02-16 22:34:34 +03:00
rpl_binlog_auto_inc_bug33029.test	Bug#48308.	2010-02-16 22:34:34 +03:00
rpl_binlog_corruption-master.opt
rpl_binlog_corruption.test
rpl_binlog_grant.test	Revert a patch for Bug#48231, which introduced valgrind warnings.	2010-02-02 16:38:44 +03:00
rpl_binlog_query_filter_rules-master.opt
rpl_binlog_query_filter_rules.test
rpl_bit.test
rpl_bit_npk.test
rpl_blackhole.test
rpl_bug26395.test
rpl_bug31076.test
rpl_bug33931.test
rpl_bug38694-slave.opt
rpl_bug38694.test
rpl_bug41902-slave.opt
rpl_bug41902.test
rpl_change_master.test
rpl_charset.test
rpl_charset_sjis.test
rpl_circular_for_4_hosts.cnf
rpl_circular_for_4_hosts.test
rpl_colSize.test
rpl_commit_after_flush.test
rpl_concurrency_error-master.opt
rpl_concurrency_error.test
rpl_create_database-master.opt
rpl_create_database-slave.opt
rpl_create_database.test
rpl_create_if_not_exists.test
rpl_create_tmp_table_if_not_exists.test
rpl_critical_errors.test
rpl_cross_version-master.opt	Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with	2010-02-12 12:04:57 +08:00
rpl_cross_version.test
rpl_ddl.test
rpl_deadlock_innodb-slave.opt
rpl_deadlock_innodb.test
rpl_delete_no_where.test
rpl_do_grant.test	Automerge from mysql-trunk-bugfixing.	2010-02-10 12:16:49 +00:00
rpl_drop.test
rpl_drop_db.test
rpl_drop_if_exists.test
rpl_drop_temp-slave.opt
rpl_drop_temp.test
rpl_drop_view.test
rpl_dual_pos_advance-master.opt
rpl_dual_pos_advance.test
rpl_EE_err.test
rpl_empty_master_host.test
rpl_err_ignoredtable-slave.opt
rpl_err_ignoredtable.test
rpl_events.test	Manual merge from mysql-trunk-merge.	2010-02-03 19:21:17 +03:00
rpl_extraCol_innodb.test
rpl_extraCol_myisam.test
rpl_extraColmaster_innodb.test
rpl_extraColmaster_myisam.test
rpl_failed_optimize-master.opt
rpl_failed_optimize.test
rpl_filter_tables_not_exist-slave.opt
rpl_filter_tables_not_exist.test
rpl_flush_logs-master.opt
rpl_flush_logs.test
rpl_flushlog_loop-master.opt
rpl_flushlog_loop-master.sh
rpl_flushlog_loop-slave.opt
rpl_flushlog_loop-slave.sh
rpl_flushlog_loop.test
rpl_foreign_key_innodb.test
rpl_free_items-slave.opt
rpl_free_items.test
rpl_geometry.test
rpl_get_lock.test
rpl_get_master_version_and_clock-slave.opt
rpl_get_master_version_and_clock.test	Manual merge from mysql-trunk-merge.	2010-01-31 00:26:38 +03:00
rpl_grant.test
rpl_heartbeat.test
rpl_heartbeat_2slaves.cnf
rpl_heartbeat_2slaves.test
rpl_heartbeat_basic.cnf
rpl_heartbeat_basic.test	Manual merge from mysql-next-mr.	2010-02-05 15:05:37 +03:00
rpl_heartbeat_ssl.test
rpl_idempotency.test
rpl_ignore_grant-slave.opt
rpl_ignore_grant.test
rpl_ignore_revoke-slave.opt
rpl_ignore_revoke.test
rpl_ignore_table-slave.opt
rpl_ignore_table.test
rpl_ignore_table_update-slave.opt
rpl_ignore_table_update.test
rpl_incident-master.opt
rpl_incident.test
rpl_init_slave-slave.opt
rpl_init_slave.test
rpl_init_slave_errors.test
rpl_innodb-master.opt
rpl_innodb_bug28430-master.opt
rpl_innodb_bug28430-slave.opt
rpl_innodb_bug28430.test
rpl_innodb_bug30888.test
rpl_innodb_mixed_ddl.test
rpl_innodb_mixed_dml.test
rpl_insert.test
rpl_insert_id.test
rpl_insert_id_pk.test
rpl_insert_ignore.test
rpl_insert_select.test
rpl_invoked_features.test
rpl_ip_mix.cnf
rpl_ip_mix.test	New patch for bug#49579, now with "have_ipv4_mapped.inc".	2010-01-29 11:48:11 +01:00
rpl_ip_mix2.cnf
rpl_ip_mix2.test	New patch for bug#49579, now with "have_ipv4_mapped.inc".	2010-01-29 11:48:11 +01:00
rpl_ipv4_as_ipv6.cnf
rpl_ipv4_as_ipv6.test	New patch for bug#49579, now with "have_ipv4_mapped.inc".	2010-01-29 11:48:11 +01:00
rpl_ipv6.cnf
rpl_ipv6.test	New patch for bug#49579, now with "have_ipv4_mapped.inc".	2010-01-29 11:48:11 +01:00
rpl_killed_ddl-master.opt
rpl_killed_ddl.test	next-mr -> next-4284 merge.	2010-02-05 20:04:38 +03:00
rpl_known_bugs_detection-master.opt
rpl_known_bugs_detection.test
rpl_LD_INFILE.test
rpl_load_from_master-slave.opt
rpl_loaddata.test
rpl_loaddata_charset.test
rpl_loaddata_fatal-slave.opt
rpl_loaddata_fatal.test
rpl_loaddata_m-master.opt
rpl_loaddata_m.test
rpl_loaddata_map-master.opt
rpl_loaddata_map-slave.opt
rpl_loaddata_map.test
rpl_loaddata_s-slave.opt
rpl_loaddata_s.test
rpl_loaddata_simple.test
rpl_loaddata_symlink-master.opt
rpl_loaddata_symlink-master.sh
rpl_loaddata_symlink-slave.opt
rpl_loaddata_symlink-slave.sh
rpl_loaddata_symlink.test	Bug #50061 Test "rpl_loaddata_symlink" uses a Unix-specific "run-slave" script	2010-02-05 14:49:01 +08:00
rpl_loaddatalocal.test
rpl_loadfile.test
rpl_locale.test
rpl_log_pos.test
rpl_manual_change_index_file.test
rpl_many_optimize.test
rpl_master_pos_wait.test
rpl_misc_functions-slave.sh
rpl_misc_functions.test	BUG#50767: Some RPL tests started to fail in next-mr-merge on	2010-02-02 12:26:28 +03:00
rpl_mix_found_rows.test
rpl_mix_insert_delayed.test
rpl_mixed_binlog_max_cache_size-master.opt
rpl_mixed_binlog_max_cache_size.test
rpl_mixed_bit_pk.test
rpl_mixed_ddl_dml.test
rpl_mixed_implicit_commit_binlog.test
rpl_mixed_mixing_engines.test
rpl_mixed_row_innodb.test
rpl_multi_delete-slave.opt
rpl_multi_delete.test
rpl_multi_delete2-slave.opt
rpl_multi_delete2.test
rpl_multi_engine.test
rpl_multi_update.test
rpl_multi_update2-slave.opt
rpl_multi_update2.test
rpl_multi_update3.test
rpl_multi_update4-slave.opt
rpl_multi_update4.test
rpl_mysql_upgrade.test
rpl_name_const.test
rpl_nondeterministic_functions.test	BUG#50767: Some RPL tests started to fail in next-mr-merge on	2010-02-02 12:26:28 +03:00
rpl_not_null_innodb.test
rpl_not_null_myisam.test
rpl_optimize.test
rpl_packet-master.opt
rpl_packet-slave.opt
rpl_packet.test
rpl_plugin_load-master.opt
rpl_plugin_load-slave.opt
rpl_plugin_load.test
rpl_ps.test
rpl_rbr_to_sbr.test
rpl_read_only.test
rpl_relay_space_innodb.test
rpl_relay_space_myisam.test
rpl_relayrotate-slave.opt
rpl_relayrotate.test
rpl_relayspace-slave.opt
rpl_relayspace.test
rpl_replicate_do-slave.opt
rpl_replicate_do.test
rpl_replicate_ignore_db-slave.opt
rpl_replicate_ignore_db.test
rpl_report-slave.opt
rpl_report.test
rpl_rewrt_db-slave.opt
rpl_rewrt_db.test
rpl_rotate_logs-slave.opt
rpl_rotate_logs-slave.sh
rpl_rotate_logs.cnf
rpl_rotate_logs.test
rpl_row_001.test
rpl_row_4_bytes-master.opt
rpl_row_4_bytes.test
rpl_row_basic_2myisam.test
rpl_row_basic_3innodb.test
rpl_row_basic_8partition.test
rpl_row_basic_11bugs-master.opt
rpl_row_basic_11bugs.test
rpl_row_binlog_max_cache_size-master.opt
rpl_row_binlog_max_cache_size.test
rpl_row_blob_innodb.test
rpl_row_blob_myisam.test
rpl_row_colSize.test
rpl_row_conflicts.test
rpl_row_create_table.test
rpl_row_delayed_ins.test
rpl_row_disabled_slave_key.test
rpl_row_drop.test
rpl_row_err_daisychain-master.opt
rpl_row_err_daisychain-slave.opt
rpl_row_flsh_tbls.test
rpl_row_func001.test
rpl_row_func002.test
rpl_row_func003.test
rpl_row_idempotency.test
rpl_row_implicit_commit_binlog.test
rpl_row_inexist_tbl.test
rpl_row_insert_delayed.test
rpl_row_loaddata_concurrent.test
rpl_row_log-master.opt
rpl_row_log-slave.opt
rpl_row_log.test
rpl_row_log_innodb-master.opt
rpl_row_log_innodb.test
rpl_row_max_relay_size.test
rpl_row_mixing_engines.test
rpl_row_mysqlbinlog-master.opt
rpl_row_mysqlbinlog.test	WL#5154 Remove deprecated 4.1 features	2010-02-17 10:18:17 +01:00
rpl_row_NOW.test
rpl_row_reset_slave.test
rpl_row_show_relaylog_events.test
rpl_row_sp001.test
rpl_row_sp002_innodb.test
rpl_row_sp003.test
rpl_row_sp005.test
rpl_row_sp006_InnoDB.test
rpl_row_sp007_innodb.test
rpl_row_sp008.test
rpl_row_sp009.test
rpl_row_sp010.test
rpl_row_sp011.test
rpl_row_sp012.test
rpl_row_tabledefs_2myisam.test
rpl_row_tabledefs_3innodb.test
rpl_row_tbl_metadata.test
rpl_row_trig001.test
rpl_row_trig002.test
rpl_row_trig003.test
rpl_row_trig004.test
rpl_row_trunc_temp.test
rpl_row_unsafe_funcs.test
rpl_row_until.test
rpl_row_USER.test
rpl_row_UUID.test
rpl_row_view01.test
rpl_row_wide_table.test
rpl_semi_sync-master.opt
rpl_semi_sync-slave.opt
rpl_semi_sync.test	BUG#50157 Assertion !active_tranxs_->is_tranx_end_pos(..) in ReplSemiSyncMaster::commitTrx	2010-01-31 02:26:51 +08:00
rpl_semi_sync_event-master.opt
rpl_semi_sync_event-slave.opt
rpl_semi_sync_event.test
rpl_server_id.test
rpl_server_id1.test
rpl_server_id2-slave.opt
rpl_server_id2.test
rpl_server_id_ignore-slave.opt
rpl_server_id_ignore.test
rpl_session_var.test
rpl_set_charset.test
rpl_set_null_innodb.test	BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete:	2010-01-21 17:20:24 +00:00
rpl_set_null_myisam.test	BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete:	2010-01-21 17:20:24 +00:00
rpl_sf.test
rpl_show_slave_hosts.cnf
rpl_show_slave_hosts.test
rpl_skip_error-slave.opt
rpl_skip_error.test
rpl_slave_grp_exec.test
rpl_slave_load_in.test
rpl_slave_load_remove_tmpfile-slave.opt
rpl_slave_load_remove_tmpfile.test
rpl_slave_load_tmpdir_not_exist-slave.opt
rpl_slave_load_tmpdir_not_exist.test
rpl_slave_skip.test
rpl_slave_status.test
rpl_slow_query_log-slave.opt	BUG#48632: Fix for Bug #23300 Has Not Been Backported	2010-02-05 17:01:09 +00:00
rpl_slow_query_log.test	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-02-09 12:59:38 +05:00
rpl_sp-master.opt
rpl_sp-slave.opt
rpl_sp.test	Fix a sporadic failure of rpl_sp.test in next-4284 tree: when doing	2010-02-11 19:02:21 +03:00
rpl_sp004.test
rpl_sp_effects-master.opt
rpl_sp_effects-slave.opt
rpl_sp_effects.test
rpl_spec_variables-slave.opt
rpl_spec_variables.test
rpl_sporadic_master-master.opt
rpl_sporadic_master.test
rpl_ssl.test
rpl_ssl1.test
rpl_start_stop_slave-slave.opt
rpl_stm_000001.test
rpl_stm_auto_increment_bug33029.test
rpl_stm_binlog_direct-master.opt
rpl_stm_binlog_max_cache_size-master.opt
rpl_stm_binlog_max_cache_size.test
rpl_stm_conflicts.test
rpl_stm_EE_err2.test
rpl_stm_flsh_tbls.test
rpl_stm_found_rows.test
rpl_stm_implicit_commit_binlog.test
rpl_stm_innodb.test
rpl_stm_insert_delayed.test
rpl_stm_loaddata_concurrent.test
rpl_stm_loadfile.test
rpl_stm_log-master.opt
rpl_stm_log-slave.opt
rpl_stm_log.test
rpl_stm_max_relay_size.test
rpl_stm_mix_show_relaylog_events.test
rpl_stm_mixing_engines.test
rpl_stm_multi_query.test
rpl_stm_no_op.test
rpl_stm_reset_slave.test
rpl_stm_start_stop_slave.test	Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.	2010-02-02 10:56:42 +03:00
rpl_stm_stop_middle_group.test	Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.	2010-02-02 10:56:42 +03:00
rpl_stm_until.test	Manual merge from mysql-trunk-merge.	2010-01-31 01:06:50 +03:00
rpl_stm_user_variables.test
rpl_switch_stm_row_mixed.test
rpl_sync-slave.opt
rpl_sync.test
rpl_temp_table.test
rpl_temp_table_mix_row.test
rpl_temporary.test
rpl_temporary_errors-slave.opt
rpl_temporary_errors.test
rpl_timezone-master.opt
rpl_timezone-slave.opt
rpl_timezone.test
rpl_tmp_table_and_DDL.test	BUG#50984: check_testcase fails for rpl_tmp_table_and_DDL	2010-02-10 12:12:55 +00:00
rpl_trigger.test
rpl_trunc_temp.test
rpl_truncate_2myisam.test
rpl_truncate_3innodb.test
rpl_typeconv-slave.opt
rpl_typeconv.test
rpl_typeconv_innodb.test
rpl_udf-master.opt
rpl_udf-slave.opt
rpl_udf.test
rpl_user.test	Revert a patch for Bug#48231, which introduced valgrind warnings.	2010-02-02 16:38:44 +03:00
rpl_user_variables.test
rpl_variables.test
rpl_variables_stm.test
rpl_view.test
rpl_view_multi.test	Add a suppression for use of functions unsafe in statement	2010-02-05 18:05:13 +03:00