mariadb/mysql-test/suite/rpl_ndb/t
unknown 03c110ea21 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_gb2312.result:
  Auto merged
mysql-test/r/ctype_gbk.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/lib/mtr_report.pl:
  SCCS merged
2008-03-26 10:27:00 +01:00
..
disabled.def Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 2008-02-26 19:34:02 +03:00
rpl_ndb_2innodb-master.opt Bug#32648 Test failure between NDB Cluster and other engines 2008-01-04 15:33:01 +01:00
rpl_ndb_2innodb-slave.opt Bug#32648 Test failure between NDB Cluster and other engines 2008-01-04 15:33:01 +01:00
rpl_ndb_2innodb.test 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-master.opt Bug#32648 Test failure between NDB Cluster and other engines 2008-01-04 15:33:01 +01:00
rpl_ndb_2myisam-slave.opt Bug#32648 Test failure between NDB Cluster and other engines 2008-01-04 15:33:01 +01:00
rpl_ndb_2myisam.test 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-slave.opt correcting wrong test case 2008-02-11 15:06:07 +01:00
rpl_ndb_2ndb.test correcting wrong test case 2008-02-11 15:06:07 +01:00
rpl_ndb_2other-slave.opt Bug#32648 Test failure between NDB Cluster and other engines 2008-01-04 15:33:01 +01:00
rpl_ndb_2other.test 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-master.opt Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status 2007-11-02 13:07:14 +01:00
rpl_ndb_apply_status.test 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.test Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_bank.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_basic.test Problem: sporadic pushbuild errors in rpl_ndb_basic. 2008-03-10 16:24:12 +01:00
rpl_ndb_blob.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_blob2.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_circular.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_circular_simplex.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_commit_afterflush.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_ctype_ucs2_def-master.opt Many tests have been moved to suite/*. Some tests have been removed. 2007-07-04 23:41:15 +02:00
rpl_ndb_ctype_ucs2_def.test Many tests have been moved to suite/*. Some tests have been removed. 2007-07-04 23:41:15 +02:00
rpl_ndb_dd_basic.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_dd_partitions-master.opt rpl_ndb_dd_partitions-slave.opt: 2007-08-21 16:26:00 +02:00
rpl_ndb_dd_partitions-slave.opt rpl_ndb_dd_partitions-slave.opt: 2007-08-21 16:26:00 +02:00
rpl_ndb_dd_partitions.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_ddl.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_delete_nowhere.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_do_db-slave.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_do_db.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_do_table-slave.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_do_table.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_extraCol.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_func003.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_idempotent.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_innodb2ndb-master.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_innodb2ndb-slave.opt BUG#29549 (Endians: test failures on Solaris): 2007-10-11 18:18:05 +02:00
rpl_ndb_innodb2ndb.test BUG#29549 (Endians: test failures on Solaris): 2007-10-11 18:18:05 +02:00
rpl_ndb_innodb_trans-slave.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_innodb_trans.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_insert_ignore.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_load.test Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_log-master.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_log.test Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_multi.test corrected really strange test 2008-02-12 14:50:36 +01:00
rpl_ndb_multi_update2-slave.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_multi_update2.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_multi_update3.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_myisam2ndb-slave.opt BUG#29549 (Endians: test failures on Solaris): 2007-10-11 18:18:05 +02:00
rpl_ndb_myisam2ndb.test BUG#29549 (Endians: test failures on Solaris): 2007-10-11 18:18:05 +02:00
rpl_ndb_relayrotate-slave.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_relayrotate.test Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_rep_ignore-slave.opt WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_rep_ignore.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_row_001.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_sp003.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_sp006.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_stm_innodb-master.opt Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
rpl_ndb_stm_innodb.test Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
rpl_ndb_sync.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndb_transaction-master.opt BUG#26395: if crash during autocommit update to transactional table on master, slave fails 2007-12-14 14:40:45 +01:00
rpl_ndb_transaction-slave.opt BUG#26395: if crash during autocommit update to transactional table on master, slave fails 2007-12-14 14:40:45 +01:00
rpl_ndb_transaction.test Post-merge fixes 2008-03-14 17:45:14 +01:00
rpl_ndb_trig004.test tests actually work in statement based 2007-09-05 18:44:47 +02:00
rpl_ndb_UUID.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_ndbapi_multi.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_row_basic_7ndb.test Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
rpl_truncate_7ndb.test Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00