From: Li-Bing.Song Date: April 13 2010 8:56am Subject: bzr commit into mysql-5.1-bugteam branch (Li-Bing.Song:3449) Bug#49741 List-Archive: http://lists.mysql.com/commits/105474 X-Bug: 49741 Message-Id: <201004130857.o3D8vN4C025884@anders-server> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8303136997074405579==" --===============8303136997074405579== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/anders/work/bzrwork/worktree1/mysql-5.1-bugteam/ based on revid:omer@stripped 3449 Li-Bing.Song@stripped 2010-04-13 Bug #49741 test files contain explicit references to bin/relay-log positions Some of the test cases reference to binlog position and these position numbers are written into result explicitly. It is difficult to maintain if log event format changes. After this patch, All the binlog position numbers which can be effected by changing binlog format are removed from the result file. @ mysql-test/extra/binlog_tests/binlog.test It only cares whether current binlog file index is changed, so it is ok with 'show_master_status.inc' instead of 'show mater status'. @ mysql-test/include/get_relay_log_pos.inc According to the position of a log event in master binlog file, find the peer position of a log event in relay log file. @ mysql-test/include/show_slave_status3.inc Until_log_pos is masked in include file. @ mysql-test/r/flush_block_commit_notembedded.result It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. @ mysql-test/r/multi_update.result It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. @ mysql-test/suite/binlog/r/binlog_innodb.result It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. @ mysql-test/suite/binlog/r/binlog_row_binlog.result Position in the result of 'show master status' is replaced by '#'. @ mysql-test/suite/binlog/r/binlog_stm_binlog.result Position in the result of 'show master status' is replaced by '#'. @ mysql-test/suite/binlog/t/binlog_innodb.test It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. @ mysql-test/suite/bugs/r/rpl_bug36391.result Position in the result of 'show master status' is replaced by '#'. @ mysql-test/suite/bugs/t/rpl_bug36391.test 'show master status' is replaced by 'show_master_status.inc'. Position in the result of 'show master status' is replaced by '#'. @ mysql-test/suite/engines/funcs/r/rpl_000015.result It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. @ mysql-test/suite/engines/funcs/t/rpl_log_pos.test Use 'query_get_value(SHOW MASTER STATUS, Position, 1)' to get the number of current binlog position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements. The numbers of 'master_log_pos' in result file are replaced by '#'. @ mysql-test/suite/engines/funcs/t/rpl_row_until.test Use 'query_get_value(SHOW MASTER STATUS, Position, 1)' to get the number of current binlog position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements. The numbers of 'master_log_pos' in result file are replaced by '#'. @ mysql-test/suite/rpl/t/rpl_dual_pos_advance.test Use 'query_get_value(SHOW MASTER STATUS, Position, 1)' to get the number of current binlog position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements. The numbers of 'master_log_pos' in result file are replaced by '#'. @ mysql-test/suite/rpl/t/rpl_slave_skip.test Use 'query_get_value(SHOW MASTER STATUS, Position, 1)' to get the number of current binlog position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements. The numbers of 'master_log_pos' in result file are replaced by '#'. @ mysql-test/suite/rpl/t/rpl_stm_until.test Use 'query_get_value(SHOW MASTER STATUS, Position, 1)' to get the number of current binlog position, and use binlog position variables instead of explicit number in the 'CHANGE MASTER' statements. The numbers of 'master_log_pos' in result file are replaced by '#'. @ mysql-test/t/flush_block_commit_notembedded.test It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. @ mysql-test/t/multi_update.test It checks whether somethings are binlogged, so we using 'show_binlog_event.inc' instead of 'show master status'. added: mysql-test/include/get_relay_log_pos.inc mysql-test/include/show_slave_status3.inc modified: mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/rpl_tests/rpl_deadlock.test mysql-test/r/flush_block_commit_notembedded.result mysql-test/r/multi_update.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/binlog/t/binlog_innodb.test mysql-test/suite/bugs/r/rpl_bug36391.result mysql-test/suite/bugs/t/rpl_bug36391.test mysql-test/suite/engines/funcs/r/rpl_000015.result mysql-test/suite/engines/funcs/r/rpl_log_pos.result mysql-test/suite/engines/funcs/r/rpl_row_until.result mysql-test/suite/engines/funcs/t/rpl_000015.test mysql-test/suite/engines/funcs/t/rpl_log_pos.test mysql-test/suite/engines/funcs/t/rpl_row_until.test mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_dual_pos_advance.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_stm_until.result mysql-test/suite/rpl/t/rpl_dual_pos_advance.test mysql-test/suite/rpl/t/rpl_log_pos.test mysql-test/suite/rpl/t/rpl_slave_skip.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/t/flush_block_commit_notembedded.test mysql-test/t/multi_update.test === modified file 'mysql-test/extra/binlog_tests/binlog.test' --- a/mysql-test/extra/binlog_tests/binlog.test 2009-10-14 15:46:45 +0000 +++ b/mysql-test/extra/binlog_tests/binlog.test 2010-04-13 08:56:00 +0000 @@ -249,14 +249,15 @@ reset master; drop table if exists t3; --enable_warnings create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb; -show master status; +source include/show_master_status.inc; let $it=4; while ($it) { insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); dec $it; } -show master status /* must show new binlog index after rotating */; +# must show new binlog index after rotating; +source include/show_master_status.inc; drop table t3; --echo # === modified file 'mysql-test/extra/rpl_tests/rpl_deadlock.test' --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test 2009-04-03 21:33:13 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test 2010-04-13 08:56:00 +0000 @@ -103,6 +103,7 @@ SET global max_relay_log_size=0; --source include/stop_slave.inc DELETE FROM t2; # Set slave position to the BEGIN log event +--replace_result $master_pos_begin MASTER_POS_BEGIN eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin; BEGIN; # Hold lock === added file 'mysql-test/include/get_relay_log_pos.inc' --- a/mysql-test/include/get_relay_log_pos.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/include/get_relay_log_pos.inc 2010-04-13 08:56:00 +0000 @@ -0,0 +1,51 @@ +# Get the relay log positon of a log event. + +# Usage: +# $relay_log_file: The log event is in which relay log +# $master_pos_log: The log event's position in master binlog file + +# let $relay_log_file= 'relay-log-bin.000001'; +# let $master_log_pos= 106; +# source include/get_relay_log_pos.inc; + +# The log event's position in relay log file is set into $relay_log_pos + +let $MYSQLD_DATADIR= `select @@datadir`; +let $tmp_file= $MYSQLTEST_VARDIR/tmp/mysqlbinlog.events; +--exec $MYSQL_BINLOG $MYSQLD_DATADIR/$relay_log_file > $tmp_file + +# All queries in this file should not be logged. +--disable_query_log + +--disable_warnings +DROP TEMPORARY TABLE IF EXISTS mysqlbinlog_events; +DROP TEMPORARY TABLE IF EXISTS events_at; +DROP TEMPORARY TABLE IF EXISTS events_pos; +CREATE TEMPORARY TABLE mysqlbinlog_events(c1 INT AUTO_INCREMENT KEY, c2 varchar(256)); + +# Event postion is in the comments output by mysqlbinlog, we load this +# comments into the table +# '# at 106' +# '# .... end_log_pos 106' +eval LOAD DATA LOCAL INFILE '$tmp_file' INTO TABLE mysqlbinlog_events + LINES STARTING BY '#' (c2) SET c1 = NULL; +--enable_warnings + +# Event pos in relay log file is inserted into table events_at +CREATE TEMPORARY TABLE events_at(c1 INT AUTO_INCREMENT KEY, c2 varchar(256)) + SELECT c2 FROM mysqlbinlog_events WHERE c2 LIKE ' at%' ORDER BY c1; + +# Event pos in master log file is inserted into table events_pos +CREATE TEMPORARY TABLE events_pos(c1 INT AUTO_INCREMENT KEY, c2 varchar(256)) + SELECT c2 FROM mysqlbinlog_events WHERE c2 LIKE '% end_log_pos %' ORDER BY c1; + +# The relationship between master_log_pos and relay_log_pos is that +# events_pos.c1 + 1 = events_at.c1. +# +# There is a fault that we can't get the relay log position of the last event, +# as it is not output by mysqlbinlog +let $relay_log_pos= `SELECT SUBSTRING(a.c2, 5) + FROM events_at a, events_pos b + WHERE a.c1=b.c1+1 and b.c2 LIKE '% $master_log_pos%'`; +DROP TEMPORARY TABLE mysqlbinlog_events, events_at, events_pos; +--enable_query_log === added file 'mysql-test/include/show_slave_status3.inc' --- a/mysql-test/include/show_slave_status3.inc 1970-01-01 00:00:00 +0000 +++ b/mysql-test/include/show_slave_status3.inc 2010-04-13 08:56:00 +0000 @@ -0,0 +1,8 @@ +# Include file to show the slave status, masking out some information +# that varies depending on where the test is executed. + +# masked out log positions + +--replace_result $MASTER_MYPORT MASTER_PORT +--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 26 # 33 # 35 # 36 # +query_vertical SHOW SLAVE STATUS; === modified file 'mysql-test/r/flush_block_commit_notembedded.result' --- a/mysql-test/r/flush_block_commit_notembedded.result 2009-03-06 14:56:17 +0000 +++ b/mysql-test/r/flush_block_commit_notembedded.result 2010-04-13 08:56:00 +0000 @@ -7,15 +7,13 @@ SET AUTOCOMMIT=0; INSERT t1 VALUES (1); # Switch to connection con2 FLUSH TABLES WITH READ LOCK; -SHOW MASTER STATUS; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info # Switch to connection con1 COMMIT; # Switch to connection con2 -SHOW MASTER STATUS; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info UNLOCK TABLES; # Switch to connection con1 DROP TABLE t1; === modified file 'mysql-test/r/multi_update.result' --- a/mysql-test/r/multi_update.result 2010-02-10 14:37:34 +0000 +++ b/mysql-test/r/multi_update.result 2010-04-13 08:56:00 +0000 @@ -602,9 +602,9 @@ select * from t2 /* must be (3,1), (4,4) a b 3 1 4 4 -show master status /* there must be the UPDATE query event */; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 206 +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; UPDATE t2,t1 SET t2.a=t1.a+2 delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); @@ -612,9 +612,9 @@ insert into t2 values (1,2),(3,4),(4,4); reset master; UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; ERROR 23000: Duplicate entry '4' for key 'PRIMARY' -show master status /* there must be the UPDATE query event */; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 221 +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Query # # use `test`; UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a drop table t1, t2; set @@session.binlog_format= @sav_binlog_format; drop table if exists t1, t2, t3; === modified file 'mysql-test/suite/binlog/r/binlog_innodb.result' --- a/mysql-test/suite/binlog/r/binlog_innodb.result 2009-05-31 05:44:41 +0000 +++ b/mysql-test/suite/binlog/r/binlog_innodb.result 2010-04-13 08:56:00 +0000 @@ -156,9 +156,9 @@ select * from t2 /* must be (3,1), (4,4) a b 1 1 4 4 -show master status /* there must no UPDATE in binlog */; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 +# There must no UPDATE in binlog; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); @@ -166,8 +166,8 @@ insert into t2 values (1,2),(3,4),(4,4); reset master; UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; ERROR 23000: Duplicate entry '4' for key 'PRIMARY' -show master status /* there must be no UPDATE query event */; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 +# There must be no UPDATE query event; +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info drop table t1, t2; End of tests === modified file 'mysql-test/suite/binlog/r/binlog_row_binlog.result' --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result 2009-10-14 15:46:45 +0000 +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result 2010-04-13 08:56:00 +0000 @@ -1289,14 +1289,14 @@ drop table if exists t3; create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 346 +master-bin.000001 # insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); -show master status /* must show new binlog index after rotating */; +show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000002 106 +master-bin.000002 # drop table t3; # # Bug #45998: database crashes when running "create as select" === modified file 'mysql-test/suite/binlog/r/binlog_stm_binlog.result' --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2009-10-14 15:46:45 +0000 +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2010-04-13 08:56:00 +0000 @@ -764,14 +764,14 @@ drop table if exists t3; create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 346 +master-bin.000001 # insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaa'); -show master status /* must show new binlog index after rotating */; +show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000002 106 +master-bin.000002 # drop table t3; # # Bug #45998: database crashes when running "create as select" === modified file 'mysql-test/suite/binlog/t/binlog_innodb.test' --- a/mysql-test/suite/binlog/t/binlog_innodb.test 2009-01-08 02:06:54 +0000 +++ b/mysql-test/suite/binlog/t/binlog_innodb.test 2010-04-13 08:56:00 +0000 @@ -155,7 +155,8 @@ reset master; UPDATE t2,t1 SET t2.a=t1.a+2; # check select * from t2 /* must be (3,1), (4,4) */; -show master status /* there must no UPDATE in binlog */; +--echo # There must no UPDATE in binlog; +source include/show_binlog_events.inc; # B. testing multi_update::send_error() execution branch delete from t1; @@ -165,7 +166,8 @@ insert into t2 values (1,2),(3,4),(4,4); reset master; --error ER_DUP_ENTRY UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; -show master status /* there must be no UPDATE query event */; +--echo # There must be no UPDATE query event; +source include/show_binlog_events.inc; # cleanup bug#27716 drop table t1, t2; === modified file 'mysql-test/suite/bugs/r/rpl_bug36391.result' --- a/mysql-test/suite/bugs/r/rpl_bug36391.result 2009-01-27 20:49:37 +0000 +++ b/mysql-test/suite/bugs/r/rpl_bug36391.result 2010-04-13 08:56:00 +0000 @@ -13,5 +13,6 @@ Tables_in_test t1 show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 278 +master-bin.000001 # flush logs; +drop table t1; === modified file 'mysql-test/suite/bugs/t/rpl_bug36391.test' --- a/mysql-test/suite/bugs/t/rpl_bug36391.test 2009-01-27 20:49:37 +0000 +++ b/mysql-test/suite/bugs/t/rpl_bug36391.test 2010-04-13 08:56:00 +0000 @@ -21,8 +21,10 @@ create table t1(id int); show tables; -show master status; +--source include/show_master_status.inc flush logs; --exec $MYSQL_BINLOG $MYSQL_TEST_DIR/var/log/master-bin.000001 | $MYSQL test + +drop table t1; === modified file 'mysql-test/suite/engines/funcs/r/rpl_000015.result' --- a/mysql-test/suite/engines/funcs/r/rpl_000015.result 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/r/rpl_000015.result 2010-04-13 08:56:00 +0000 @@ -5,9 +5,8 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; reset master; -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 +show binlog events from ; +Log_name Pos Event_type Server_id End_log_pos Info stop slave; reset slave; show slave status; === modified file 'mysql-test/suite/engines/funcs/r/rpl_log_pos.result' --- a/mysql-test/suite/engines/funcs/r/rpl_log_pos.result 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/r/rpl_log_pos.result 2010-04-13 08:56:00 +0000 @@ -4,39 +4,33 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error -# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 106 # # master-bin.000001 Yes Yes 0 0 106 # None 0 No # No 0 0 +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 MASTER_LOG_POS # # master-bin.000001 Yes Yes 0 0 MASTER_LOG_POS # None 0 No # No 0 0 stop slave; -change master to master_log_pos=106; +change master to master_log_pos=MASTER_LOG_POS; start slave; stop slave; -change master to master_log_pos=106; +change master to master_log_pos=MASTER_LOG_POS; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error -# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 106 # # master-bin.000001 No No 0 0 106 # None 0 No # No 0 0 +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 MASTER_LOG_POS # # master-bin.000001 No No 0 0 MASTER_LOG_POS # None 0 No # No 0 0 start slave; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error -# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 106 # # master-bin.000001 Yes Yes 0 0 106 # None 0 No # No 0 0 +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 MASTER_LOG_POS # # master-bin.000001 Yes Yes 0 0 MASTER_LOG_POS # None 0 No # No 0 0 stop slave; change master to master_log_pos=177; start slave; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error -# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 177 # # master-bin.000001 No Yes 0 0 177 # None 0 No # No 1236 Got fatal error 1236 from master when reading data from binary log: 'Client requested master to start replication from impossible position' 0 -show master status; -File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 106 +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 MASTER_LOG_POS # # master-bin.000001 No Yes 0 0 MASTER_LOG_POS # None 0 No # No 1236 Got fatal error 1236 from master when reading data from binary log: 'Client requested master to start replication from impossible position' 0 create table if not exists t1 (n int); drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); stop slave; -change master to master_log_pos=206; +change master to master_log_pos=MASTER_LOG_POS; start slave; select * from t1 ORDER BY n; n === modified file 'mysql-test/suite/engines/funcs/r/rpl_row_until.result' --- a/mysql-test/suite/engines/funcs/r/rpl_row_until.result 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/r/rpl_row_until.result 2010-04-13 08:56:00 +0000 @@ -12,7 +12,7 @@ create table t2(n int not null auto_incr insert into t2 values (1),(2); insert into t2 values (3),(4); drop table t2; -start slave until master_log_file='master-bin.000001', master_log_pos=311; +start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS; select * from t1; n 1 @@ -45,7 +45,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Master Until_Log_File master-bin.000001 -Until_Log_Pos 311 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -90,7 +90,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Master Until_Log_File master-no-such-bin.000001 -Until_Log_Pos 291 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -103,8 +103,10 @@ Last_IO_Errno 0 Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error -start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728; +start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=1014; select * from t2; +n 1 +n 2 show slave status; Slave_IO_State # Master_Host 127.0.0.1 @@ -131,7 +133,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Relay Until_Log_File slave-relay-bin.000004 -Until_Log_Pos 728 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -146,16 +148,16 @@ Last_SQL_Errno 0 Last_SQL_Error start slave; stop slave; -start slave until master_log_file='master-bin.000001', master_log_pos=740; -show slave status; +start slave until master_log_file='master-bin.000001', master_log_pos=868; +SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 Master_User root -Master_Port MASTER_MYPORT +Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 Read_Master_Log_Pos # -Relay_Log_File slave-relay-bin.000004 +Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 Slave_IO_Running Yes @@ -163,7 +165,7 @@ Slave_SQL_Running No Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 @@ -173,7 +175,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Master Until_Log_File master-bin.000001 -Until_Log_Pos 740 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -182,8 +184,8 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno 0 -Last_IO_Error +Last_IO_Errno # +Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error start slave until master_log_file='master-bin', master_log_pos=561; === modified file 'mysql-test/suite/engines/funcs/t/rpl_000015.test' --- a/mysql-test/suite/engines/funcs/t/rpl_000015.test 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/t/rpl_000015.test 2010-04-13 08:56:00 +0000 @@ -6,7 +6,7 @@ source include/master-slave.inc; reset master; -show master status; +source include/show_binlog_events.inc; save_master_pos; connection slave; stop slave; === modified file 'mysql-test/suite/engines/funcs/t/rpl_log_pos.test' --- a/mysql-test/suite/engines/funcs/t/rpl_log_pos.test 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/t/rpl_log_pos.test 2010-04-13 08:56:00 +0000 @@ -11,36 +11,40 @@ # Passes with rbr no problem, removed statement include [jbm] source include/master-slave.inc; ---replace_column 3 -show master status; +let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1); sync_slave_with_master; ---replace_result $MASTER_MYPORT MASTER_PORT +--replace_result $master_log_pos MASTER_LOG_POS $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # show slave status; stop slave; -change master to master_log_pos=106; + +--replace_result $master_log_pos MASTER_LOG_POS +eval change master to master_log_pos=$master_log_pos; start slave; sleep 5; stop slave; -change master to master_log_pos=106; ---replace_result $MASTER_MYPORT MASTER_PORT + +--replace_result $master_log_pos MASTER_LOG_POS +eval change master to master_log_pos=$master_log_pos; +--replace_result $master_log_pos MASTER_LOG_POS $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # show slave status; start slave; sleep 5; ---replace_result $MASTER_MYPORT MASTER_PORT +--replace_result $master_log_pos MASTER_LOG_POS $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # show slave status; stop slave; +--echo # impossible position leads to an error change master to master_log_pos=177; start slave; sleep 2; ---replace_result $MASTER_MYPORT MASTER_PORT +--replace_result 177 MASTER_LOG_POS $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # show slave status; connection master; ---replace_column 3 -show master status; + +let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1); create table if not exists t1 (n int); drop table if exists t1; create table t1 (n int); @@ -48,7 +52,9 @@ insert into t1 values (1),(2),(3); save_master_pos; connection slave; stop slave; -change master to master_log_pos=206; + +--replace_result $master_log_pos MASTER_LOG_POS +eval change master to master_log_pos=$master_log_pos; start slave; sync_with_master; select * from t1 ORDER BY n; === modified file 'mysql-test/suite/engines/funcs/t/rpl_row_until.test' --- a/mysql-test/suite/engines/funcs/t/rpl_row_until.test 2010-03-18 06:42:07 +0000 +++ b/mysql-test/suite/engines/funcs/t/rpl_row_until.test 2010-04-13 08:56:00 +0000 @@ -18,22 +18,26 @@ connection master; # create some events on master create table t1(n int not null auto_increment primary key); insert into t1 values (1),(2),(3),(4); +let $master_log_pos_1= query_get_value(SHOW MASTER STATUS, Position, 1); drop table t1; + create table t2(n int not null auto_increment primary key); insert into t2 values (1),(2); +let $master_log_pos_2= query_get_value(SHOW MASTER STATUS, Position, 1); insert into t2 values (3),(4); drop table t2; # try to replicate all queries until drop of t1 connection slave; -start slave until master_log_file='master-bin.000001', master_log_pos=311; +--replace_result $master_log_pos_1 MASTER_LOG_POS +eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_1; sleep 2; wait_for_slave_to_stop; # here table should be still not deleted select * from t1; --vertical_results --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 7 # 9 # 11 # 22 # 23 # 33 # +--replace_column 1 # 7 # 9 # 11 # 22 # 23 # 26 # 33 # show slave status; # this should fail right after start @@ -44,17 +48,21 @@ sleep 2; wait_for_slave_to_stop; --vertical_results --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 7 # 9 # 11 # 22 # 23 # 33 # +--replace_column 1 # 7 # 9 # 11 # 22 # 23 # 26 # 33 # show slave status; # try replicate all up to and not including the second insert to t2; -start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728; +let $master_log_pos= $master_log_pos_2; +let $relay_log_file= slave-relay-bin.000004; +--source include/get_relay_log_pos.inc +#--replace_result $relay_log_pos RELAY_LOG_POS +eval start slave until relay_log_file='$relay_log_file', relay_log_pos=$relay_log_pos; sleep 2; wait_for_slave_to_stop; select * from t2; --vertical_results --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 1 # 7 # 9 # 11 # 22 # 23 # 33 # +--replace_column 1 # 7 # 9 # 11 # 22 # 23 # 26 # 33 # show slave status; # clean up @@ -66,14 +74,15 @@ sync_with_master; stop slave; # this should stop immediately as we are already there -start slave until master_log_file='master-bin.000001', master_log_pos=740; +eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_2; sleep 2; wait_for_slave_to_stop; # here the sql slave thread should be stopped ---vertical_results ---replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 ---replace_column 1 # 7 # 9 # 22 # 23 # 33 # -show slave status; +#--vertical_results +#--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 +#--replace_column 1 # 7 # 9 # 22 # 23 # 33 # +#show slave status; +source include/show_slave_status3.inc; #testing various error conditions --error 1277 === modified file 'mysql-test/suite/rpl/r/rpl_deadlock_innodb.result' --- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2009-04-03 21:33:13 +0000 +++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2010-04-13 08:56:00 +0000 @@ -157,7 +157,7 @@ SET @my_max_relay_log_size= @@global.max SET global max_relay_log_size=0; include/stop_slave.inc DELETE FROM t2; -CHANGE MASTER TO MASTER_LOG_POS=440; +CHANGE MASTER TO MASTER_LOG_POS=MASTER_POS_BEGIN; BEGIN; SELECT * FROM t1 FOR UPDATE; a === modified file 'mysql-test/suite/rpl/r/rpl_dual_pos_advance.result' --- a/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result 2008-03-14 13:54:17 +0000 +++ b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result 2010-04-13 08:56:00 +0000 @@ -22,20 +22,20 @@ insert into t3 values(2); insert into t3 values(3); commit; insert into t3 values(4); -start slave until master_log_file="slave-bin.000001",master_log_pos=195; +start slave until master_log_file="slave-bin.000001",master_log_pos=MASTER_LOG_POS; Warnings: Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart show tables; Tables_in_test t1 t2 -start slave until master_log_file="slave-bin.000001",master_log_pos=438; +start slave until master_log_file="slave-bin.000001",master_log_pos=MASTER_LOG_POS; Warnings: Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart select * from t3; n 1 -start slave until master_log_file="slave-bin.000001",master_log_pos=663; +start slave until master_log_file="slave-bin.000001",master_log_pos=MASTER_LOG_POS; Warnings: Note 1278 It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart select * from t3; === modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result' --- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2009-09-24 13:19:06 +0000 +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2010-04-13 08:56:00 +0000 @@ -9,7 +9,7 @@ show master status; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000001 # include/stop_slave.inc -change master to master_log_pos=75; +change master to master_log_pos=MASTER_LOG_POS; SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 @@ -97,7 +97,7 @@ create table if not exists t1 (n int); drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); -change master to master_log_pos=4; +change master to master_log_pos=MASTER_LOG_POS; start slave; select * from t1 ORDER BY n; n === modified file 'mysql-test/suite/rpl/r/rpl_slave_skip.result' --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result 2009-05-31 05:44:41 +0000 +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result 2010-04-13 08:56:00 +0000 @@ -42,7 +42,7 @@ c d 2 8 3 18 **** On Slave **** -START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762; +START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS; SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 @@ -104,7 +104,7 @@ show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # User var # # @`foo`=12 master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(@foo, 2*@foo) -START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=106; +START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; START SLAVE; SHOW SLAVE STATUS; === modified file 'mysql-test/suite/rpl/r/rpl_stm_until.result' --- a/mysql-test/suite/rpl/r/rpl_stm_until.result 2010-01-27 17:27:49 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_until.result 2010-04-13 08:56:00 +0000 @@ -17,7 +17,7 @@ insert into t2 values (3),(4); drop table t2; ==== Replicate one event at a time on slave ==== [on slave] -start slave until master_log_file='master-bin.000001', master_log_pos=323; +start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS; select * from t1; n 1 @@ -50,7 +50,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Master Until_Log_File master-bin.000001 -Until_Log_Pos 323 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -96,7 +96,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Master Until_Log_File master-no-such-bin.000001 -Until_Log_Pos 291 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -109,7 +109,7 @@ Last_IO_Errno # Last_IO_Error # Last_SQL_Errno 0 Last_SQL_Error -start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746; +start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=RELAY_LOG_POS; select * from t2; n 1 @@ -140,7 +140,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Relay Until_Log_File slave-relay-bin.000004 -Until_Log_Pos 746 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path @@ -157,7 +157,7 @@ start slave; [on master] [on slave] include/stop_slave.inc -start slave until master_log_file='master-bin.000001', master_log_pos=776; +start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS; SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 @@ -184,7 +184,7 @@ Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition Master Until_Log_File master-bin.000001 -Until_Log_Pos 776 +Until_Log_Pos # Master_SSL_Allowed No Master_SSL_CA_File Master_SSL_CA_Path === modified file 'mysql-test/suite/rpl/t/rpl_dual_pos_advance.test' --- a/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test 2009-01-09 14:12:31 +0000 +++ b/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test 2010-04-13 08:56:00 +0000 @@ -40,6 +40,8 @@ sync_with_master; stop slave; create table t2 (n int); # create one ignored event +let $master_log_pos_1= query_get_value(SHOW MASTER STATUS, Position, 1); +let $master_log_pos_1= `SELECT $master_log_pos_1 + 5`; save_master_pos; connection slave; @@ -52,8 +54,12 @@ show tables; save_master_pos; create table t3 (n int) engine=innodb; +let $master_log_pos_2= query_get_value(SHOW MASTER STATUS, Position, 1); +let $master_log_pos_2= `SELECT $master_log_pos_2 + 5`; set @a=1; insert into t3 values(@a); +let $master_log_pos_3= query_get_value(SHOW MASTER STATUS, Position, 1); +let $master_log_pos_3= `SELECT $master_log_pos_3 + 5`; begin; insert into t3 values(2); insert into t3 values(3); @@ -66,7 +72,8 @@ connection master; # bug is that START SLAVE UNTIL may stop too late, we test that by # asking it to stop before creation of t3. -start slave until master_log_file="slave-bin.000001",master_log_pos=195; +--replace_result $master_log_pos_1 MASTER_LOG_POS +eval start slave until master_log_file="slave-bin.000001",master_log_pos=$master_log_pos_1; --source include/wait_for_slave_sql_to_stop.inc # then BUG#13861 causes t3 to show up below (because stopped too @@ -75,12 +82,14 @@ start slave until master_log_file="slave show tables; # ensure that we do not break set @a=1; insert into t3 values(@a); -start slave until master_log_file="slave-bin.000001",master_log_pos=438; +--replace_result $master_log_pos_2 MASTER_LOG_POS +eval start slave until master_log_file="slave-bin.000001",master_log_pos=$master_log_pos_2; --source include/wait_for_slave_sql_to_stop.inc select * from t3; # ensure that we do not break transaction -start slave until master_log_file="slave-bin.000001",master_log_pos=663; +--replace_result $master_log_pos_3 MASTER_LOG_POS +eval start slave until master_log_file="slave-bin.000001",master_log_pos=$master_log_pos_3; --source include/wait_for_slave_sql_to_stop.inc select * from t3; === modified file 'mysql-test/suite/rpl/t/rpl_log_pos.test' --- a/mysql-test/suite/rpl/t/rpl_log_pos.test 2009-09-24 13:19:06 +0000 +++ b/mysql-test/suite/rpl/t/rpl_log_pos.test 2010-04-13 08:56:00 +0000 @@ -16,6 +16,7 @@ source include/show_master_status.inc; sync_slave_with_master; source include/stop_slave.inc; +--replace_result 75 MASTER_LOG_POS change master to master_log_pos=75; source include/show_slave_status2.inc; start slave; @@ -32,6 +33,7 @@ create table t1 (n int); insert into t1 values (1),(2),(3); save_master_pos; connection slave; +--replace_result 4 MASTER_LOG_POS change master to master_log_pos=4; start slave; sync_with_master; === modified file 'mysql-test/suite/rpl/t/rpl_slave_skip.test' --- a/mysql-test/suite/rpl/t/rpl_slave_skip.test 2010-03-01 12:33:15 +0000 +++ b/mysql-test/suite/rpl/t/rpl_slave_skip.test 2010-04-13 08:56:00 +0000 @@ -14,6 +14,7 @@ CREATE TABLE t1 (a INT, b INT); CREATE TABLE t2 (c INT, d INT); INSERT INTO t1 VALUES (1,1),(2,4),(3,9); INSERT INTO t2 VALUES (1,1),(2,8),(3,27); +let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1); UPDATE t1,t2 SET b = d, d = b * 2 WHERE a = c; source include/show_binlog_events.inc; @@ -21,12 +22,12 @@ source include/show_binlog_events.inc; SELECT * FROM t1; SELECT * FROM t2; save_master_pos; - --echo **** On Slave **** connection slave; # Stop when reaching the the first table map event. -START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762; +--replace_result $master_log_pos MASTER_LOG_POS +eval START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=$master_log_pos; source include/wait_for_slave_sql_to_stop.inc; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 # @@ -53,12 +54,14 @@ RESET MASTER; SET SESSION BINLOG_FORMAT=STATEMENT; SET @foo = 12; +let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1); INSERT INTO t1 VALUES(@foo, 2*@foo); save_master_pos; source include/show_binlog_events.inc; connection slave; -START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=106; +--replace_result $master_log_pos MASTER_LOG_POS +eval START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=$master_log_pos; source include/wait_for_slave_sql_to_stop.inc; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; START SLAVE; === modified file 'mysql-test/suite/rpl/t/rpl_stm_until.test' --- a/mysql-test/suite/rpl/t/rpl_stm_until.test 2010-01-27 17:27:49 +0000 +++ b/mysql-test/suite/rpl/t/rpl_stm_until.test 2010-04-13 08:56:00 +0000 @@ -34,9 +34,11 @@ sync_slave_with_master; connection master; create table t1(n int not null auto_increment primary key); insert into t1 values (1),(2),(3),(4); +let $master_log_pos_1= query_get_value(SHOW MASTER STATUS, Position, 1); drop table t1; create table t2(n int not null auto_increment primary key); insert into t2 values (1),(2); +let $master_log_pos_2= query_get_value(SHOW MASTER STATUS, Position, 1); insert into t2 values (3),(4); drop table t2; @@ -45,12 +47,13 @@ drop table t2; # try to replicate all queries until drop of t1 --echo [on slave] connection slave; -start slave until master_log_file='master-bin.000001', master_log_pos=323; +--replace_result $master_log_pos_1 MASTER_LOG_POS +eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_1; --source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc # here table should be still not deleted select * from t1; -source include/show_slave_status2.inc; +source include/show_slave_status3.inc; # this should fail right after start start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; @@ -58,14 +61,18 @@ start slave until master_log_file='maste --source include/wait_for_slave_sql_to_stop.inc # again this table should be still not deleted select * from t1; -source include/show_slave_status2.inc; +source include/show_slave_status3.inc; +let $relay_log_file= slave-relay-bin.000004; +let $master_log_pos= $master_log_pos_2; +source include/get_relay_log_pos.inc; # try replicate all up to and not including the second insert to t2; -start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746; +--replace_result $relay_log_pos RELAY_LOG_POS +eval start slave until relay_log_file='$relay_log_file', relay_log_pos=$relay_log_pos; --source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc select * from t2; -source include/show_slave_status2.inc; +source include/show_slave_status3.inc; # clean up start slave; @@ -76,11 +83,12 @@ sync_slave_with_master; --source include/stop_slave.inc # this should stop immediately as we are already there -start slave until master_log_file='master-bin.000001', master_log_pos=776; +--replace_result $master_log_pos_2 MASTER_LOG_POS +eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_log_pos_2; --source include/wait_for_slave_io_to_start.inc --source include/wait_for_slave_sql_to_stop.inc --replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 -source include/show_slave_status2.inc; +source include/show_slave_status3.inc; --echo ==== Test various error conditions ==== === modified file 'mysql-test/t/flush_block_commit_notembedded.test' --- a/mysql-test/t/flush_block_commit_notembedded.test 2009-03-06 14:56:17 +0000 +++ b/mysql-test/t/flush_block_commit_notembedded.test 2010-04-13 08:56:00 +0000 @@ -28,14 +28,14 @@ INSERT t1 VALUES (1); --echo # Switch to connection con2 connection con2; FLUSH TABLES WITH READ LOCK; -SHOW MASTER STATUS; +--source include/show_binlog_events.inc --echo # Switch to connection con1 connection con1; send COMMIT; --echo # Switch to connection con2 connection con2; sleep 1; -SHOW MASTER STATUS; +--source include/show_binlog_events.inc UNLOCK TABLES; --echo # Switch to connection con1 connection con1; === modified file 'mysql-test/t/multi_update.test' --- a/mysql-test/t/multi_update.test 2010-02-10 14:37:34 +0000 +++ b/mysql-test/t/multi_update.test 2010-04-13 08:56:00 +0000 @@ -585,7 +585,7 @@ reset master; UPDATE t2,t1 SET t2.a=t1.a+2; # check select * from t2 /* must be (3,1), (4,4) */; -show master status /* there must be the UPDATE query event */; +source include/show_binlog_events.inc; # B. testing multi_update::send_error() ineffective update # (as there is a policy described at mysql_update() still go to binlog) @@ -596,7 +596,7 @@ insert into t2 values (1,2),(3,4),(4,4); reset master; --error ER_DUP_ENTRY UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; -show master status /* there must be the UPDATE query event */; +source include/show_binlog_events.inc; # cleanup drop table t1, t2; --===============8303136997074405579== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/li-bing.song@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: li-bing.song@stripped # target_branch: file:///home/anders/work/bzrwork/worktree1/mysql-5.1-\ # bugteam/ # testament_sha1: 2f9454fec977060fb1298c0a2405c3d966ea7144 # timestamp: 2010-04-13 16:56:13 +0800 # source_branch: file:///home/anders/work/bzrwork/worktree1/mysql-5.0-\ # bugteam/ # base_revision_id: omer@stripped # # Begin bundle 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 pwoSHYHDfUA= --===============8303136997074405579==--