diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-07-16 11:17:10 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-07-16 11:17:10 +0200 |
| commit | ed8a08ba0cde153deb4626eb7ec0e9e48379abb6 (patch) | |
| tree | bcb34ccd59771269c00a28b56da072ec2ed5baaf /mysql-test/suite/rpl | |
| parent | 17d8bd786bb6719513295720903ca8603e0aea80 (diff) | |
| download | mariadb-git-ed8a08ba0cde153deb4626eb7ec0e9e48379abb6.tar.gz | |
BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
Post-post-push fix. The result file for rpl_rbr_to_sbr needs to be
updated. While I was there, made rpl_rbr_to_sbr clean up after itself
by reverting @@binlog_format to the value it had before the test
started.
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result index 8f145b94046..0551240eb8a 100644 --- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result +++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result @@ -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; @@ -65,7 +66,6 @@ Last_SQL_Error SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 # Query 2 # use `test`; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9 slave-bin.000001 # Query 1 # use `test`; CREATE TABLE t1 (a INT, b LONG) slave-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES (1,1), (2,2) slave-bin.000001 # Query 1 # use `test`; BEGIN @@ -73,3 +73,4 @@ slave-bin.000001 # Table_map 1 # table_id: # (test.t1) 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; diff --git a/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test b/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test index 72ae6a99c44..8863c9d4ac7 100644 --- a/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test +++ b/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test @@ -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 |