diff options
Diffstat (limited to 'mysql-test/suite/parts/t/rpl_partition.test')
| -rw-r--r-- | mysql-test/suite/parts/t/rpl_partition.test | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/mysql-test/suite/parts/t/rpl_partition.test b/mysql-test/suite/parts/t/rpl_partition.test index c5ee20971b3..6a5a17ad5af 100644 --- a/mysql-test/suite/parts/t/rpl_partition.test +++ b/mysql-test/suite/parts/t/rpl_partition.test @@ -11,6 +11,19 @@ set @old_session_binlog_format= @@session.binlog_format; SET GLOBAL binlog_format = 'ROW'; SET SESSION binlog_format = 'ROW'; select @@global.binlog_format, @@session.binlog_format; +--echo [on slave] +connection slave; +set @old_global_binlog_format= @@global.binlog_format; +set @old_session_binlog_format= @@session.binlog_format; +SET GLOBAL binlog_format = 'ROW'; +SET SESSION binlog_format = 'ROW'; +select @@global.binlog_format, @@session.binlog_format; +# restart slave so that slave sql thread's binlog format is re-read +# from @@global.binlog_format +--source include/stop_slave.inc +--source include/start_slave.inc +--echo [on master] +connection master; --disable_warnings DROP TABLE IF EXISTS t1, t2, t3; @@ -158,8 +171,9 @@ DROP TABLE t1, t2, t3; DROP PROCEDURE IF EXISTS p1; DROP PROCEDURE IF EXISTS p2; DROP PROCEDURE IF EXISTS p3; -save_master_pos; -connection slave; -sync_with_master; +--echo [on slave] +sync_slave_with_master; +set @@global.binlog_format= @old_global_binlog_format; +set @@session.binlog_format= @old_session_binlog_format; # End of 5.1 tests |