mariadb/mysql-test/extra/rpl_tests
unknown 2c86b5ad16 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl


client/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/ctype_cp932_binlog_stm.result:
  Manual merge
  ,
mysql-test/r/flush_block_commit_notembedded.result:
  Manual merge
mysql-test/r/rpl_000015.result:
  Manual merge
mysql-test/r/rpl_change_master.result:
  Manual merge
mysql-test/r/rpl_deadlock_innodb.result:
  Manual merge
mysql-test/r/rpl_flushlog_loop.result:
  Manual merge
  ,
mysql-test/r/rpl_loaddata.result:
  manual merge
mysql-test/r/rpl_loaddata_s.result:
  manual merge
  ,
mysql-test/r/rpl_log_pos.result:
  manual merge
mysql-test/r/rpl_ndb_charset.result:
  manual merge
mysql-test/r/rpl_ndb_log.result:
  manual merge
  ,
mysql-test/r/rpl_ndb_multi.result:
  manual merge
mysql-test/r/rpl_rbr_to_sbr.result:
  manual merge
mysql-test/r/rpl_rotate_logs.result:
  Manual merge
mysql-test/r/rpl_row_basic_11bugs.result:
  Manual merge
mysql-test/r/rpl_row_charset.result:
  Manual merge
mysql-test/r/rpl_row_create_table.result:
  Manual merge
mysql-test/r/rpl_row_delayed_ins.result:
  Manual merge
mysql-test/r/rpl_row_drop.result:
  Manual merge
mysql-test/r/rpl_row_flsh_tbls.result:
  Manual merge
mysql-test/r/rpl_row_inexist_tbl.result:
  Manual merge
mysql-test/r/rpl_row_log.result:
  Manual merge
mysql-test/r/rpl_row_log_innodb.result:
  Manual merge
mysql-test/r/rpl_row_max_relay_size.result:
  Manual merge
mysql-test/r/rpl_row_reset_slave.result:
  Manual merge
mysql-test/r/rpl_row_until.result:
  Manual merge
mysql-test/r/rpl_server_id1.result:
  Manual merge
mysql-test/r/rpl_server_id2.result:
  Manual merge
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/r/rpl_stm_charset.result:
  Manual merge
mysql-test/r/rpl_stm_flsh_tbls.result:
  Manual merge
mysql-test/r/rpl_stm_log.result:
  Manual merge
mysql-test/r/rpl_stm_max_relay_size.result:
  Manual merge
mysql-test/r/rpl_stm_multi_query.result:
  Manual merge
mysql-test/r/rpl_stm_reset_slave.result:
  Manual merge
mysql-test/r/rpl_stm_until.result:
  Manual merge
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Manual merge
mysql-test/r/rpl_truncate_2myisam.result:
  Manual merge
mysql-test/r/rpl_truncate_3innodb.result:
  Manual merge
mysql-test/r/rpl_truncate_7ndb.result:
  Manual merge
mysql-test/r/user_var-binlog.result:
  Manual merge
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Manual merge
mysql-test/extra/binlog_tests/binlog.test:
  Binlog position change.
mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
  Binlog position change.
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Binlog position change.
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Binlog position change.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_log.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Binlog position change.
mysql-test/include/show_binlog_events.inc:
  Binlog position change.
mysql-test/r/binlog_row_binlog.result:
  Result change
mysql-test/r/binlog_row_ctype_ucs.result:
  Result change
mysql-test/r/binlog_row_insert_select.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/binlog_stm_binlog.result:
  Result change
mysql-test/r/binlog_stm_ctype_ucs.result:
  Result change
mysql-test/r/binlog_stm_insert_select.result:
  Result change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_row.result:
  Result change
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Binlog position change.
mysql-test/t/ctype_cp932_binlog_stm.test:
  Binlog position change.
mysql-test/t/mysqlbinlog.test:
  Binlog position change.
mysql-test/t/mysqlbinlog2.test:
  Binlog position change.
mysql-test/t/rpl_loaddata_s.test:
  Binlog position change.
mysql-test/t/rpl_log_pos.test:
  Binlog position change.
mysql-test/t/rpl_row_basic_11bugs.test:
  Binlog position change.
mysql-test/t/rpl_row_create_table.test:
  Binlog position change.
mysql-test/t/rpl_row_flsh_tbls.test:
  Binlog position change.
mysql-test/t/rpl_row_mysqlbinlog.test:
  Binlog position change.
mysql-test/t/rpl_sp.test:
  Binlog position change.
mysql-test/t/rpl_stm_flsh_tbls.test:
  Binlog position change.
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Binlog position change.
mysql-test/t/user_var-binlog.test:
  Binlog position change.
sql/share/errmsg.txt:
  Merging error messages
2007-03-29 21:38:03 +02:00
..
rpl_auto_increment.test Give warnings for unused objects 2007-01-22 18:42:52 +02:00
rpl_commit_after_flush.test
rpl_ddl.test Bug#19066 (DELETE FROM inconsistency for NDB): 2006-06-01 11:53:27 +02:00
rpl_deadlock.test Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-29 21:38:03 +02:00
rpl_delete_no_where.test
rpl_EE_err.test
rpl_extraSlave_Col.test Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after 2006-11-03 16:31:25 +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 Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools 2006-10-04 16:35:40 +02:00
rpl_foreign_key.test Give warnings for unused objects 2007-01-22 18:42:52 +02:00
rpl_insert_delayed.test rpl_insert_delayed.test: 2007-02-24 16:35:15 +01:00
rpl_insert_id.test Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-02-24 11:52:08 +01:00
rpl_insert_id_pk.test Give warnings for unused objects 2007-01-22 18:42:52 +02:00
rpl_insert_ignore.test
rpl_loaddata.test Give warnings for unused objects 2007-01-22 18:42:52 +02:00
rpl_log.test Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-29 21:38:03 +02:00
rpl_max_relay_size.test Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-15 10:31:23 +01:00
rpl_multi_query.test Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-29 21:38:03 +02:00
rpl_multi_update.test
rpl_multi_update2.test
rpl_multi_update3.test ndb - 2006-08-29 10:47:28 +02:00
rpl_ndb_2multi_eng.test test update 2006-04-12 19:38:40 +02:00
rpl_ndb_ddl.test Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after 2006-11-03 16:31:25 +01:00
rpl_partition.test
rpl_relayrotate.test
rpl_reset_slave.test
rpl_row_001.test
rpl_row_basic.test Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-22 19:18:22 +02:00
rpl_row_blob.test Use "diff_files" instead ot "exec diff" 2007-02-20 18:47:47 +01:00
rpl_row_charset.test Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-29 21:38:03 +02:00
rpl_row_delayed_ins.test Bug #24998 rpl_row_delayed_ins.test fails in pushbuild 2007-01-11 23:59:12 +02:00
rpl_row_func003.test Make sure tests drops objects created and restore variables to default 2007-03-01 14:16:38 +01:00
rpl_row_sp002.test WL#3464: Add replication event to denote gap in replication 2007-03-29 20:31:09 +02:00
rpl_row_sp003.test WL#3464: Add replication event to denote gap in replication 2007-03-29 20:31:09 +02:00
rpl_row_sp006.test Use "diff_files" instead ot "exec diff" 2007-02-20 18:47:47 +01:00
rpl_row_sp007.test
rpl_row_tabledefs.test Make sure tests drops objects created and restore variables to default 2007-03-01 14:16:38 +01:00
rpl_row_UUID.test Use "diff_files" instead ot "exec diff" 2007-02-20 18:47:47 +01:00
rpl_stm_000001.test Changes made according to HLD/LLD. 2006-08-30 10:22:43 +03:00
rpl_stm_charset.test Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-29 21:38:03 +02:00
rpl_stm_EE_err2.test Give warnings for unused objects 2007-01-22 18:42:52 +02: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 Change to new (after merge) error numbers 2007-01-23 01:58:07 +02:00
rpl_truncate.test WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. 2006-12-07 09:18:35 -05:00
rpl_truncate_helper.test Update test results to new mysqltest 2006-10-04 23:48:24 +02:00