unknown 2e12a17d17 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam ...

into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl


mysql-test/suite/binlog/r/binlog_base64_flag.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_base64_flag.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

2008-03-28 14:52:33 +01:00

..

rpl_ndb_2innodb.result

default changed not to run idempotent, but test requires it because of how ndb logs updates as write

2008-02-11 15:26:38 +01:00

rpl_ndb_2myisam.result

default changed not to run idempotent, but test requires it because of how ndb logs updates as write

2008-02-11 15:26:38 +01:00

rpl_ndb_2ndb.result

correcting wrong test case

2008-02-11 15:06:07 +01:00

rpl_ndb_2other.result

default changed not to run idempotent, but test requires it because of how ndb logs updates as write

2008-02-11 15:26:38 +01:00

rpl_ndb_apply_status.result

Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status

2007-11-02 13:07:14 +01:00

rpl_ndb_auto_inc.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_bank.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_basic.result

Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2

2007-06-27 14:29:10 +02:00

rpl_ndb_blob2.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_blob.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_circular_simplex.result

BUG#27972 (Test failure for rpl_ndb_circular_simplex):

2007-07-27 15:06:46 +02:00

rpl_ndb_circular.result

Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2

2007-06-27 14:29:10 +02:00

rpl_ndb_commit_afterflush.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_ctype_ucs2_def.result

bug#29562 default collation of ucs2_unicode_ci crashes slave

2007-11-28 15:35:25 +04:00

rpl_ndb_dd_basic.result

Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2

2007-06-27 14:29:10 +02:00

rpl_ndb_dd_partitions.result

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main

2007-07-25 15:40:43 +02:00

rpl_ndb_ddl.result

Enabled test rpl_ndb_ddl

2007-12-11 11:51:14 +01:00

rpl_ndb_delete_nowhere.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_do_db.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_do_table.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_extraCol.result

Bug #22234 Extra Slave Col: Slave should stop on Error Field d of table

2008-03-06 20:32:47 +02:00

rpl_ndb_func003.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_idempotent.result

Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2

2007-06-27 14:29:10 +02:00

rpl_ndb_innodb2ndb.result

repair some rpl_ndb test cases

2007-08-27 13:13:00 +02:00

rpl_ndb_innodb_trans.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_insert_ignore.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_load.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_log.result

BUG#29020 (Event results not correctly replicated to slave in RBR):

2008-03-28 13:16:41 +01:00

rpl_ndb_multi_update2.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_multi_update3.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_multi.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_myisam2ndb.result

repair some rpl_ndb test cases

2007-08-27 13:13:00 +02:00

rpl_ndb_relayrotate.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_rep_ignore.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_row_001.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_sp003.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_sp006.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_stm_innodb.result

correct merge error

2008-02-14 00:02:25 +01:00

rpl_ndb_sync.result

Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2

2007-06-27 14:29:10 +02:00

rpl_ndb_transaction.result

Post-merge fixes to make tests pass.

2008-01-13 22:13:17 +01:00

rpl_ndb_trig004.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_UUID.result

Merge maint1.mysql.com:/data/localhome/tsmith/bk/51

2007-07-04 22:38:53 +02:00

rpl_ndbapi_multi.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_row_basic_7ndb.result

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

2007-12-19 18:51:46 +01:00

rpl_truncate_7ndb.result

WL#3228 (NDB) : RBR using different table defs on slave/master

2007-07-29 18:10:42 -04:00