diff options
| author | unknown <mats@romeo.(none)> | 2007-03-29 21:38:03 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-03-29 21:38:03 +0200 |
| commit | 2c86b5ad16f816b9a609f9b958fcc545058a89f4 (patch) | |
| tree | 7f9eedf72c49812d1bdb3523f075b644a6e43f55 /mysql-test/t/mysqlbinlog2.test | |
| parent | 092c052280dbd0392367eb0f51e5af1a8bc50436 (diff) | |
| parent | adaf162bc206c3833001a11feaeddfa41c223dcf (diff) | |
| download | mariadb-git-2c86b5ad16f816b9a609f9b958fcc545058a89f4.tar.gz | |
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
Diffstat (limited to 'mysql-test/t/mysqlbinlog2.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog2.test | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index 52045abbe78..cd49d3570e9 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -52,11 +52,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=607 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=607 $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -82,11 +82,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=607 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=133 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -109,11 +109,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=607 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=607 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -136,11 +136,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=607 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 +--exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=133 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 +--exec $MYSQL_BINLOG --short-form --stop-position=134 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log |