Alexander Nozdrin 87bd812fc8 Auto-merge from mysql-next-mr.		2009-12-03 12:20:54 +03:00
..
rpl000001.a.result
rpl000001.b.result
rpl000010.result
rpl000011.result
rpl000013.result
rpl000017.result
rpl_000015.result
rpl_alter.result
rpl_alter_db.result
rpl_auto_increment.result
rpl_auto_increment_11932.result
rpl_auto_increment_update_failure.result
rpl_begin_commit_rollback.result
rpl_binlog_corruption.result
rpl_binlog_grant.result
rpl_binlog_max_cache_size.result
rpl_binlog_query_filter_rules.result
rpl_bit.result
rpl_bit_npk.result
rpl_blackhole.result
rpl_bug26395.result
rpl_bug31076.result
rpl_bug33931.result	WL#3894, post-push fix.	2009-11-28 17:53:48 +03:00
rpl_bug38694.result
rpl_bug41902.result
rpl_change_master.result
rpl_charset.result
rpl_charset_sjis.result
rpl_circular_for_4_hosts.result
rpl_colSize.result
rpl_commit_after_flush.result
rpl_concurrency_error.result
rpl_create_database.result
rpl_create_if_not_exists.result
rpl_create_tmp_table_if_not_exists.result
rpl_critical_errors.result
rpl_critical_errors.result.txt
rpl_cross_version.result
rpl_ddl.result
rpl_deadlock_innodb.result
rpl_delete_no_where.result
rpl_do_grant.result
rpl_drop.result
rpl_drop_db.result
rpl_drop_if_exists.result
rpl_drop_temp.result
rpl_drop_view.result
rpl_dual_pos_advance.result
rpl_EE_err.result
rpl_empty_master_host.result
rpl_err_ignoredtable.result
rpl_events.result
rpl_extraCol_innodb.result
rpl_extraCol_myisam.result
rpl_extraColmaster_innodb.result
rpl_extraColmaster_myisam.result
rpl_failed_optimize.result
rpl_filter_tables_not_exist.result
rpl_flushlog_loop.result
rpl_foreign_key_innodb.result
rpl_found_rows.result
rpl_free_items.result
rpl_get_lock.result
rpl_get_master_version_and_clock.result	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
rpl_grant.result
rpl_heartbeat.result
rpl_heartbeat_2slaves.result
rpl_heartbeat_basic.result
rpl_heartbeat_ssl.result
rpl_idempotency.result
rpl_ignore_grant.result
rpl_ignore_revoke.result
rpl_ignore_table.result
rpl_ignore_table_update.result
rpl_incident.result
rpl_init_slave.result
rpl_init_slave_errors.result
rpl_innodb.result
rpl_innodb_bug28430.result
rpl_innodb_bug30888.result
rpl_innodb_mixed_ddl.result
rpl_innodb_mixed_dml.result
rpl_insert.result
rpl_insert_id.result
rpl_insert_id_pk.result
rpl_insert_ignore.result
rpl_insert_select.result
rpl_invoked_features.result
rpl_ip_mix.result	another patch to fix differences.	2009-11-27 13:08:38 +01:00
rpl_ip_mix2.result	another patch to fix differences.	2009-11-27 13:08:38 +01:00
rpl_ip_mix2_win.result	another patch to fix differences.	2009-11-27 13:08:38 +01:00
rpl_ip_mix_win.result	another patch to fix differences.	2009-11-27 13:08:38 +01:00
rpl_ipv4_as_ipv6.result
rpl_ipv4_as_ipv6_win.result	another patch to fix differences.	2009-11-27 13:08:38 +01:00
rpl_ipv6.result
rpl_ipv6_win.result	another patch to fix differences.	2009-11-27 13:08:38 +01:00
rpl_killed_ddl.result
rpl_known_bugs_detection.result
rpl_LD_INFILE.result
rpl_loaddata.result	merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw	2009-11-30 14:34:39 +02:00
rpl_loaddata_charset.result
rpl_loaddata_fatal.result
rpl_loaddata_m.result
rpl_loaddata_map.result
rpl_loaddata_s.result
rpl_loaddata_simple.result
rpl_loaddatalocal.result
rpl_loadfile.result
rpl_locale.result
rpl_log_pos.result
rpl_many_optimize.result
rpl_master_pos_wait.result
rpl_misc_functions.result
rpl_mixed_bit_pk.result
rpl_mixed_ddl_dml.result
rpl_multi_delete.result
rpl_multi_delete2.result
rpl_multi_engine.result
rpl_multi_update.result
rpl_multi_update2.result
rpl_multi_update3.result
rpl_multi_update4.result
rpl_mysql_upgrade.result
rpl_name_const.result
rpl_not_null_innodb.result
rpl_not_null_myisam.result
rpl_optimize.result
rpl_packet.result
rpl_plugin_load.result
rpl_ps.result
rpl_rbr_to_sbr.result
rpl_read_only.result
rpl_relay_space_innodb.result
rpl_relay_space_myisam.result
rpl_relayrotate.result
rpl_relayspace.result
rpl_replicate_do.result
rpl_replicate_ignore_db.result
rpl_report.result
rpl_rewrt_db.result
rpl_rotate_logs.result
rpl_row_001.result
rpl_row_4_bytes.result
rpl_row_basic_2myisam.result
rpl_row_basic_3innodb.result
rpl_row_basic_8partition.result
rpl_row_basic_11bugs-master.opt
rpl_row_basic_11bugs-slave.opt
rpl_row_basic_11bugs.result
rpl_row_blob_innodb.result
rpl_row_blob_myisam.result
rpl_row_colSize.result
rpl_row_conflicts.result
rpl_row_create_table.result
rpl_row_delayed_ins.result
rpl_row_disabled_slave_key.result
rpl_row_drop.result
rpl_row_err_ignoredtable.result
rpl_row_flsh_tbls.result
rpl_row_func001.result
rpl_row_func002.result
rpl_row_func003.result
rpl_row_inexist_tbl.result
rpl_row_insert_delayed.result
rpl_row_loaddata_m.result
rpl_row_log.result
rpl_row_log_innodb.result
rpl_row_max_relay_size.result
rpl_row_multi_query.result
rpl_row_mysqlbinlog.result
rpl_row_NOW.result
rpl_row_reset_slave.result
rpl_row_show_relaylog_events.result
rpl_row_sp001.result
rpl_row_sp002_innodb.result
rpl_row_sp003.result
rpl_row_sp005.result
rpl_row_sp006_InnoDB.result
rpl_row_sp007_innodb.result
rpl_row_sp008.result
rpl_row_sp009.result
rpl_row_sp010.result
rpl_row_sp011.result
rpl_row_sp012.result
rpl_row_tabledefs_2myisam.result
rpl_row_tabledefs_3innodb.result
rpl_row_tabledefs_7ndb.result
rpl_row_trig001.result
rpl_row_trig002.result
rpl_row_trig003.result
rpl_row_trig004.result
rpl_row_unsafe_funcs.result
rpl_row_until.result
rpl_row_USER.result
rpl_row_UUID.result
rpl_row_view01.result
rpl_row_wide_table.result
rpl_semi_sync.result
rpl_server_id.result
rpl_server_id1.result
rpl_server_id2.result
rpl_server_id_ignore.result
rpl_session_var.result
rpl_set_charset.result
rpl_sf.result
rpl_show_slave_hosts.result
rpl_skip_error.result
rpl_slave_grp_exec.result
rpl_slave_load_in.result
rpl_slave_load_remove_tmpfile.result
rpl_slave_load_tmpdir_not_exist.result
rpl_slave_skip.result
rpl_slave_status.result
rpl_slow_query_log.result
rpl_sp.result	Manual merge from mysql-next-mr.	2009-12-02 18:50:14 +03:00
rpl_sp004.result
rpl_sp_effects.result
rpl_spec_variables.result
rpl_sporadic_master.result
rpl_ssl.result
rpl_ssl1.result
rpl_start_stop_slave.result
rpl_stm_000001.result
rpl_stm_auto_increment_bug33029.result
rpl_stm_conflicts.result
rpl_stm_EE_err2.result
rpl_stm_flsh_tbls.result
rpl_stm_insert_delayed.result
rpl_stm_loadfile.result
rpl_stm_log.result
rpl_stm_max_relay_size.result
rpl_stm_mix_show_relaylog_events.result
rpl_stm_mixing_engines.result
rpl_stm_multi_query.result
rpl_stm_no_op.result
rpl_stm_reset_slave.result
rpl_stm_until.result
rpl_stop_middle_group.result
rpl_switch_stm_row_mixed.result
rpl_sync.result
rpl_temp_table.result
rpl_temp_table_mix_row.result
rpl_temporary.result
rpl_temporary_errors.result
rpl_timezone.result
rpl_trigger.result
rpl_trunc_temp.result
rpl_truncate_2myisam.result
rpl_truncate_3innodb.result
rpl_udf.result
rpl_user.result
rpl_user_variables.result
rpl_variables.result
rpl_variables_stm.result
rpl_view.result