unknown 48193af489 Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 ...

into  sita.local:/Users/tsmith/m/bk/maint/51


sql/field.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/log_event_old.h:
  Manual merge
sql/rpl_record.cc:
  Manual merge
sql/slave.cc:
  Manual merge

2007-08-29 15:28:38 -06:00

..

rpl_ndb_2innodb.result

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

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

rpl_ndb_2myisam.result

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

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

rpl_ndb_2other.result

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

2007-08-26 14:31:10 +02: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_charset.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

Many tests have been moved to suite/*. Some tests have been removed.

2007-07-04 23:41:15 +02:00

rpl_ndb_dd_advance.result

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

2007-07-04 22:38:53 +02: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

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

2007-06-27 14:28:02 +02: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

Post-merge fix of error number

2007-08-16 17:26:32 +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

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

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

rpl_ndb_mix_innodb.result

Many tests have been moved to suite/*. Some tests have been removed.

2007-07-04 23:41:15 +02: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

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

2007-07-04 22:38:53 +02: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_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

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

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

rpl_truncate_7ndb.result

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

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