mariadb/mysql-test/suite/rpl_ndb/r
unknown c44ead52b4 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/field.h:
  Manual merge
2007-08-15 21:30:45 +02: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_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_blob.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +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_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.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +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_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 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-08-15 21:30:45 +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_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.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +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_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