#At file:///home/johnemb/dev/mysql/bzr-repos/falcon-rpl-testdebug/ based on revid:hky@stripped
2920 John H. Embretsen 2008-11-27
Fix for Bug#40927 - rpl.rpl_relay_space_falcon fails when binlog-format is explicitly set to mixed.
Test failed due to BINLOG_FORMAT being set in a previous test (rpl.rpl_rbr_to_sbr), which effectively 'disabled' the check for correct binlog format in rpl.rpl_relay_space_falcon under certain circumstances (Pushbuild).
This patch makes sure that rpl.rpl_rbr_to_sbr cleans up after itself (stores and re-sets the original binlog-format value).
modified:
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
per-file messages:
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
Updating result file after making test clean up after itself.
mysql-test/suite/rpl/t/disabled.def
Test should not fail in pushbuild anymore.
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
Making the test clean up BINLOG_FORMAT settings after itself, so as not to confuse subsequent tests in the rpl suite.
=== modified file 'mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result'
--- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2008-04-02 13:14:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2008-11-27 15:33:29 +0000
@@ -4,6 +4,7 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
+SET @old_binlog_format= @@global.binlog_format;
SET BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
@@ -73,3 +74,4 @@ slave-bin.000001 # Table_map 1 # table_i
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
slave-bin.000001 # Query 1 # use `test`; COMMIT
DROP TABLE IF EXISTS t1;
+SET @@global.binlog_format= @old_binlog_format;
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-11-21 16:29:38 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-11-27 15:33:29 +0000
@@ -32,5 +32,4 @@ rpl_locktrans_innodb : Bug#37712 2
rpl_temporary_errors : Bug#36968 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
rpl_flushlog_loop : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main
rpl_truncate_falcon : Bug#40926 2008-11-21 johnemb rpl.rpl_truncate_falcon fails in Pushbuild due to wrong binlog-format being used
-rpl_relay_space_falcon : Bug#40927 2008-11-21 johnemb rpl.rpl_relay_space_falcon fails when binlog-format is explicitly set to mixed
rpl_extraCol_falcon : Bug#40930 2008-11-21 johnemb rpl.rpl_extraCol_falcon fails doing STOP SLAVE (on Windows PB2)
=== modified file 'mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test'
--- a/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test 2007-06-27 12:29:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test 2008-11-27 15:33:29 +0000
@@ -5,6 +5,8 @@
# Test that the slave temporarily switches to ROW when seeing binrow
# events when it is in STATEMENT or MIXED mode
+SET @old_binlog_format= @@global.binlog_format;
+
SET BINLOG_FORMAT=MIXED;
SET GLOBAL BINLOG_FORMAT=MIXED;
SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
@@ -33,6 +35,7 @@ SHOW BINLOG EVENTS;
connection master;
DROP TABLE IF EXISTS t1;
+SET @@global.binlog_format= @old_binlog_format;
# Let's compare. Note: If they match test will pass, if they do not match
# the test will show that the diff statement failed and not reject file
Thread |
---|
• bzr commit into mysql-6.0-falcon-team branch (john.embretsen:2920) Bug#40927 | John H. Embretsen | 27 Nov |