Alfranio Correia cd4fd3c7c1 merge mysql-5.1 --> mysql-5.5 ...

Conflicts:
  
  . mysql-test/extra/rpl_tests/rpl_insert_ignore.test
  . mysql-test/suite/rpl/t/disabled.def
  . mysql-test/suite/rpl/t/rpl_insert_ignore.test
  . sql/sql_insert.cc
  . sql/sql_repl.cc

2011-01-31 13:11:05 +00:00

..

check_type.inc

WL#5151: Conversion between different types when replicating

2009-12-14 12:04:55 +01:00

create_recursive_construct.inc

Tests: many if/while expresissons simplified after 57276

2010-11-17 11:16:13 +01:00

rpl_auto_increment_insert_view.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_auto_increment_invoke_trigger.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_auto_increment.test

Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.cc

2010-12-21 12:47:22 +08:00

rpl_autoinc_func_invokes_trigger.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_binlog_max_cache_size.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_blackhole.test

Bug #38360: BLACKHOLE replication with RBR is broken

2008-10-02 21:13:15 +02:00

rpl_charset.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_commit_after_flush.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_conflicts.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_ddl.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_deadlock.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_delete_no_where.test

…

rpl_drop_create_temp_table.inc

Tests: many if/while expresissons simplified after 57276

2010-11-17 11:16:13 +01:00

rpl_drop_create_temp_table.test

BUG#53452 Inconsistent behavior of binlog_direct_non_transactional_updates with

2010-08-20 03:59:58 +01:00

rpl_EE_err.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_extra_col_master.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_extra_col_slave.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_failed_optimize.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_flsh_tbls.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_foreign_key.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_get_master_version_and_clock.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_implicit_commit_binlog.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_innodb.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_insert_delayed.test

Tests: many if/while expresissons simplified after 57276

2010-11-17 11:16:13 +01:00

rpl_insert_duplicate.test

merge mysql-5.1 --> mysql-5.5

2011-01-31 13:11:05 +00:00

rpl_insert_id_pk.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_insert_id.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_insert_ignore.test

merge mysql-5.1 --> mysql-5.5

2011-01-31 13:11:05 +00:00

rpl_loaddata.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_loadfile.test

BUG#39701: Mixed binlog format does not switch to row mode on

2009-03-24 18:27:33 +00:00

rpl_log.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_max_relay_size.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_mixing_engines.inc

BUG#46364 MyISAM transbuffer problems (NTM problem)

2010-01-20 19:08:16 +00:00

rpl_mixing_engines.test

BUG#50670: Slave stops with error code 1644

2010-04-28 14:47:49 +02:00

rpl_multi_query.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_multi_update2.test

…

rpl_multi_update3.test

…

rpl_multi_update.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_ndb_2multi_basic.test

…

rpl_ndb_2multi_eng.test

Problem: pushbuild has sporadic errors during startup of

2008-02-11 15:14:24 +01:00

rpl_ndb_apply_status.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_not_null.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_partition.test

…

rpl_record_compare.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_relayrotate.test

…

rpl_reset_slave.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_row_001.test

…

rpl_row_basic.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_row_blob.test

Backport for WL#4416

2009-11-27 02:32:01 +03:00

rpl_row_delayed_ins.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_row_func003.test

Manual merge from mysql-trunk-merge.

2010-01-19 19:36:14 +03:00

rpl_row_sp002.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_row_sp003.test

Fix for bug #57422 "rpl_row_sp003 sporadically fails under

2010-10-13 15:21:45 +04:00

rpl_row_sp006.test

Backport fixes for the follow tests

2009-10-02 17:24:21 +08:00

rpl_row_sp007.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_row_tabledefs.test

Manual merge

2010-05-26 22:34:25 +08:00

rpl_row_UUID.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_set_null.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_show_binlog_events.inc

BUG#59444

2011-01-13 12:21:57 +00:00

rpl_show_log_events_with_varying_options.inc

BUG#59444

2011-01-13 12:21:57 +00:00

rpl_show_relaylog_events.inc

BUG#59444

2011-01-13 14:31:37 +00:00

rpl_start_stop_slave.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_stm_create_if_not_exists.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_stm_EE_err2.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_stop_middle_group.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_stop_slave.test

Some if simplifications in tests

2010-12-20 15:15:01 +01:00

rpl_sv_relay_space.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00

rpl_test_framework.inc

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_tmp_table_and_DDL.test

Bug #49132 Replication failure on temporary table + DDL

2010-01-22 17:38:21 +08:00

rpl_trig004.test

Backport for WL#4416

2009-11-27 02:32:01 +03:00

rpl_truncate_helper.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

rpl_truncate.test

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

type_conversions.test

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

2010-12-19 18:15:12 +01:00