unknown 9a51d88bfd Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl ...

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


BitKeeper/deleted/.del-binlog_start_comment.result:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_000015.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_000015.test:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
BitKeeper/deleted/.del-binlog_start_comment.test:
  Using remote file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Manual merge. Taking remote file to update result set after merge,
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Manual merge.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Manual merge.

2008-01-30 12:53:33 +01:00

..

rpl_auto_increment.test

Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1

2007-06-06 10:57:07 -07:00

rpl_commit_after_flush.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_ddl.test

Bug#18946 Test case rpl_ndb_ddl disabled

2007-03-06 18:15:31 +01:00

rpl_deadlock.test

Test case fix to replication team tree.

2007-06-21 14:39:40 +02:00

rpl_delete_no_where.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_EE_err.test

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var

2006-01-24 14:10:48 +01:00

rpl_extraMaster_Col.test

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1

2007-12-10 13:32:19 +01:00

rpl_extraSlave_Col.test

rpl_extraSlave_Col.test:

2007-10-31 14:01:01 -05:00

rpl_failed_optimize.test

Don't use row level logging on optimize or repair table.

2006-05-05 20:08:40 +03:00

rpl_flsh_tbls.test

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools

2006-10-04 16:35:40 +02:00

rpl_foreign_key.test

Bug#31552 Replication breaks when deleting rows from out-of-sync table

2007-12-12 12:14:59 +02:00

rpl_insert_delayed.test

fixing the 5.1-opt merge of the fix for bug 29571:

2007-07-27 17:29:48 +03:00

rpl_insert_id_pk.test

Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1

2007-06-06 10:57:07 -07:00

rpl_insert_id.test

Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1

2007-06-06 10:57:07 -07:00

rpl_insert_ignore.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_loaddata.test

Post.merge fixes

2007-07-01 11:56:01 +02:00

rpl_log.test

Bug#19259 rpl_ndb_dd_partitions failed on Solaris

2007-07-12 15:19:29 +08:00

rpl_max_relay_size.test

Fix for versional test

2008-01-14 15:38:02 +08:00

rpl_multi_query.test

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

2007-03-29 21:38:03 +02:00

rpl_multi_update2.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_multi_update3.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_multi_update.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_ndb_2multi_basic.test

BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134

2007-08-26 14:31:10 +02:00

rpl_ndb_2multi_eng.test

test update

2006-04-12 19:38:40 +02:00

rpl_ndb_apply_status.test

Many files:

2007-06-21 21:58:59 +02:00

rpl_partition.test

Bug#18436 (RBR: Replication to partition engine triggers assertion on slave):

2006-03-27 14:58:37 +02:00

rpl_relayrotate.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_reset_slave.test

Fix for versional test

2008-01-14 15:38:02 +08:00

rpl_row_001.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_row_basic.test

bug#31552 manual merge and post-make-test-run changes.

2007-12-12 20:12:29 +01:00

rpl_row_blob.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_row_charset.test

Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.

2007-10-09 19:51:57 +02:00

rpl_row_delayed_ins.test

- Fixing binary log positions

2007-03-30 10:27:08 +02:00

rpl_row_func003.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_row_sp002.test

WL#3464: Add replication event to denote gap in replication

2007-03-29 20:31:09 +02:00

rpl_row_sp003.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_row_sp006.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_row_sp007.test

WL#1012: All changes as one single changeset.

2005-12-22 06:39:02 +01:00

rpl_row_tabledefs.test

fix for versional test

2008-01-14 17:54:23 +08:00

rpl_row_UUID.test

BUG#28722 (Multi-engine statements on has_own_binlogging engine):

2007-06-22 01:39:23 +02:00

rpl_stm_000001.test

Updated patch for Bug#28497 based off of Magnus's review

2007-06-13 05:52:43 +02:00

rpl_stm_charset.test

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

2007-03-29 21:38:03 +02:00

rpl_stm_EE_err2.test

Updated patch for Bug#28497 based off of Magnus's review

2007-06-13 05:52:43 +02:00

rpl_sv_relay_space.test

Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):

2006-04-19 15:29:49 +02:00

rpl_trig004.test

Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1

2007-06-06 10:57:07 -07:00

rpl_truncate_helper.test

Bug #31554 rpl.rpl_truncate_2myisam test failure: wrong master binlog file name

2007-11-02 14:00:38 +02:00

rpl_truncate.test

WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.

2006-12-07 09:18:35 -05:00