mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensuring that master and slave both issue a RESET MASTER and RESET SLAVE

Browse source 
when resetting replication tests.  If not, circular replication setups
will leave cruft in the slaves binary log.

mysql-test/include/master-slave-reset.inc:
  Adding RESET MASTER on slave and RESET SLAVE on master. In order to avoid
  having to re-generate all the replication test result files, I disable the
  query log for the added statements.
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
  Adding code to clean up after test. Disabling query log for the cleanup code.
This commit is contained in:
Mats Kindahl 2008-07-09 14:34:00 +02:00
parent 9e2abfacf2
commit d034ae598f
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mysql-test/include/master-slave-reset.inc
View file

@ -1,6 +1,13 @@
# Reset the master and the slave to start fresh.
#
# It is necessary to execute RESET MASTER and RESET SLAVE on both
# master and slave since the replication setup might be circular.
#
# Since we expect STOP SLAVE to produce a warning as the slave is
# stopped (the server was started with skip-slave-start), we disable
# warnings when doing STOP SLAVE.
connection slave;
#we expect STOP SLAVE to produce a warning as the slave is stopped
#(the server was started with skip-slave-start)
--disable_warnings
stop slave;
source include/wait_for_slave_to_stop.inc;
@ -13,7 +20,13 @@ use test;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
--enable_warnings
reset master;
--disable_query_log
reset slave;
--enable_query_log
connection slave;
--disable_query_log
reset master;
--enable_query_log
reset slave;
# Clean up old test tables
--disable_warnings

6
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
View file

@ -74,3 +74,9 @@ source include/wait_for_slave_param.inc;
--replace_result $SLAVE_MYPORT SLAVE_PORT $slave_param_value POSITION
--replace_column 1 # 8 # 9 # 16 # 23 # 33 # 34 # 35 #
--query_vertical SHOW SLAVE STATUS
--disable_query_log
connection master;
DROP TABLE t1;
sync_slave_with_master;
--enable_query_log