mariadb/mysql-test/extra/rpl_tests
unknown 9933c3bd3a Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Auto merged
mysql-test/r/rpl_ddl.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/rpl_ndb_charset.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
sql/handler.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
2006-06-16 01:15:19 +02:00
..
rpl_auto_increment.test Updated test cases 2006-02-13 16:36:11 +01:00
rpl_commit_after_flush.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_ddl.test Bug#19066 (DELETE FROM inconsistency for NDB): 2006-06-01 11:53:27 +02:00
rpl_deadlock.test Manually merged 2006-04-25 13:04:39 +04:00
rpl_delete_no_where.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01: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_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 rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: 2006-05-12 14:09:13 +02:00
rpl_foreign_key.test rpl_foreign_key.test: 2006-01-23 14:07:58 +01:00
rpl_insert_id.test Merge from 5.0 2006-05-31 11:18:58 +03:00
rpl_insert_id_pk.test Implement suggestions from lars review 2006-02-08 16:47:46 +01:00
rpl_insert_ignore.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_loaddata.test Update 5.1 to use MYSQLTEST_VARDIR 2006-01-26 12:35:36 +01:00
rpl_log.test Updated to fix bug in AIX 2006-05-16 15:38:21 +02:00
rpl_max_relay_size.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_multi_query.test WL#3023 (RBR: Use locks in a statement-like manner): 2006-02-24 16:19:55 +01:00
rpl_multi_update.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_multi_update2.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_multi_update3.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_ndb_2multi_eng.test test update 2006-04-12 19:38:40 +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 WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_reset_slave.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_row_001.test Fix test cases to work with non-standard --vardir. 2006-02-22 10:07:54 +01:00
rpl_row_blob.test perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave... 2006-04-10 16:06:28 +02:00
rpl_row_charset.test WL#3023 (RBR: Use locks in a statement-like manner): 2006-03-03 09:49:46 +01:00
rpl_row_delayed_ins.test Merge mysqldev@production.mysql.com:my/mysql-5.1-release 2006-02-24 16:31:38 +01:00
rpl_row_func003.test Fix test cases to work with non-standard --vardir. 2006-02-22 10:07:54 +01:00
rpl_row_sp002.test WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_row_sp003.test test updates 2006-02-10 12:52:35 +01:00
rpl_row_sp006.test Fix test cases to work with non-standard --vardir. 2006-02-22 10:07:54 +01: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 WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
rpl_row_UUID.test increase save_master_pos timeout to 30 seconds for higher test predictability 2006-04-12 15:55:41 +02:00
rpl_stm_000001.test Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var 2006-02-07 18:04:50 +01:00
rpl_stm_charset.test WL#3023 (RBR: Use locks in a statement-like manner): 2006-02-24 16:19:55 +01:00
rpl_stm_EE_err2.test RBR test updates per lars request 2006-01-11 20:02:11 +01: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 Test updates 2006-02-15 14:02:47 +01:00
rpl_truncate.test Bug#19066 (DELETE FROM inconsistency for NDB): 2006-06-01 11:53:27 +02:00
rpl_truncate_helper.inc Bug#19066 (DELETE FROM replication inconsistency for NDB): 2006-06-13 22:10:01 +02:00