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/extra/binlog_tests | |
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/extra/binlog_tests')
5 files changed, 21 insertions, 59 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index 7d34c39c978..c59685a0e65 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -20,9 +20,7 @@ begin; insert t2 values (5); commit; # first COMMIT must be Query_log_event, second - Xid_log_event ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; drop table t1,t2; # @@ -44,10 +42,10 @@ commit; drop table t1; --replace_column 2 # 5 # --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events in 'master-bin.000001' from 105; +show binlog events in 'master-bin.000001' from 106; --replace_column 2 # 5 # --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events in 'master-bin.000002' from 105; +show binlog events in 'master-bin.000002' from 106; # Test of a too big SET INSERT_ID: see if the truncated value goes # into binlog (right), or the too big value (wrong); we look at the @@ -80,9 +78,7 @@ DELETE FROM user WHERE host='localhost' AND user='@#@'; --enable_warnings use test; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; drop table t1,t2,t3,tt1; -- source extra/binlog_tests/binlog_insert_delayed.test diff --git a/mysql-test/extra/binlog_tests/binlog_insert_delayed.test b/mysql-test/extra/binlog_tests/binlog_insert_delayed.test index a2ccb34ee07..d073c8ef227 100644 --- a/mysql-test/extra/binlog_tests/binlog_insert_delayed.test +++ b/mysql-test/extra/binlog_tests/binlog_insert_delayed.test @@ -23,9 +23,7 @@ inc $count; # moving binlog check affront of multi-rows queries which work is indeterministic (extra table_maps) # todo: better check is to substitute SHOW BINLOG with reading from binlog, probably bug#19459 is in # the way ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ -show binlog events from 105; +source include/show_binlog_events.inc; insert delayed into t1 values (null),(null),(null),(null); inc $count; inc $count; inc $count; inc $count; diff --git a/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test b/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test index 5c07b3b8f89..30585ece71c 100644 --- a/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test +++ b/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test @@ -26,9 +26,7 @@ SET @var1= x'8300'; # code (and I have used it to test the fix) until there is some way to # exercise this code from mysql-test-run. EXECUTE stmt1 USING @var1; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ -SHOW BINLOG EVENTS FROM 105; +source include/show_binlog_events.inc; SELECT HEX(f1) FROM t1; DROP table t1; # end test for bug#11338 diff --git a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test b/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test index 3b1ea3b959b..e1a9dba7775 100644 --- a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test +++ b/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test @@ -9,8 +9,7 @@ create table t2 (c char(30)) charset=ucs2; set @v=convert('abc' using ucs2); reset master; insert into t2 values (@v); ---replace_regex /table_id: [0-9]+/table_id: #/ -show binlog events from 105; +source include/show_binlog_events.inc; # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we # absolutely need variables names to be quoted and strings to be # escaped). diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index a55990cea12..d6ccc403ce9 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -29,9 +29,7 @@ insert into t1 values(1); insert into t2 select * from t1; commit; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; delete from t1; delete from t2; @@ -43,9 +41,7 @@ insert into t2 select * from t1; # should say some changes to non-transact1onal tables couldn't be rolled back rollback; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; delete from t1; delete from t2; @@ -59,9 +55,7 @@ insert into t2 select * from t1; rollback to savepoint my_savepoint; commit; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; delete from t1; delete from t2; @@ -77,9 +71,7 @@ insert into t1 values(7); commit; select a from t1 order by a; # check that savepoints work :) ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; # and when ROLLBACK is not explicit? delete from t1; @@ -99,9 +91,7 @@ connection con2; # so SHOW BINLOG EVENTS may come before con1 does the loggin. To be sure that # logging has been done, we use a user lock. select get_lock("a",10); ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; # and when not in a transact1on? delete from t1; @@ -111,9 +101,7 @@ reset master; insert into t1 values(9); insert into t2 select * from t1; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; # Check that when the query updat1ng the MyISAM table is the first in the # transaction, we log it immediately. @@ -124,16 +112,11 @@ reset master; insert into t1 values(10); # first make t1 non-empty begin; insert into t2 select * from t1; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; insert into t1 values(11); commit; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; - +source include/show_binlog_events.inc; # Check that things work like before this BEGIN/ROLLBACK code was added, # when t2 is INNODB @@ -149,9 +132,7 @@ insert into t1 values(12); insert into t2 select * from t1; commit; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; delete from t1; delete from t2; @@ -162,9 +143,7 @@ insert into t1 values(13); insert into t2 select * from t1; rollback; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; delete from t1; delete from t2; @@ -178,9 +157,7 @@ insert into t2 select * from t1; rollback to savepoint my_savepoint; commit; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; delete from t1; delete from t2; @@ -196,9 +173,7 @@ insert into t1 values(18); commit; select a from t1 order by a; # check that savepoints work :) ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; # Test for BUG#5714, where a MyISAM update in the transaction used to # release row-level locks in InnoDB @@ -257,9 +232,7 @@ insert into t2 values (3); disconnect con2; connection con3; select get_lock("lock1",60); ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; do release_lock("lock1"); drop table t0,t2; @@ -324,9 +297,7 @@ CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * ROLLBACK; SELECT * from t2; DROP TABLE t1,t2; ---replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// -show binlog events from 105; +source include/show_binlog_events.inc; # Test for BUG#16559 (ROLLBACK should always have a zero error code in # binlog). Has to be here and not earlier, as the SELECTs influence |