Commit 05482f3c authored by Dmitry Shulga's avatar Dmitry Shulga

Follow-up for Bug#29751: FLUSH LOGS doesn't create -old file,

so test case has to be updated.
parent 862af4ee
...@@ -4,12 +4,8 @@ reset master; ...@@ -4,12 +4,8 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
# Make sure the 'master_log.err-old' file does not
# exist before execute 'flush error logs' statement.
# Test if support 'flush error logs' statement. # Test if support 'flush error logs' statement.
flush error logs; flush error logs;
# Check the 'master_log.err-old' file is created
# after executed 'flush error logs' statement.
# Make sure binary logs was not be flushed # Make sure binary logs was not be flushed
# after execute 'flush error logs' statement. # after execute 'flush error logs' statement.
# Make sure relay logs was not be flushed # Make sure relay logs was not be flushed
...@@ -42,12 +38,8 @@ flush binary logs; ...@@ -42,12 +38,8 @@ flush binary logs;
# after executed 'flush binary logs' statement. # after executed 'flush binary logs' statement.
# Make sure the 'slave-relay-bin.000007' file does not exist # Make sure the 'slave-relay-bin.000007' file does not exist
# exist before execute 'flush error logs, relay logs' statement. # exist before execute 'flush error logs, relay logs' statement.
# Make sure the 'master_log.err-old' file does not exist
# before execute 'flush error logs, relay logs' statement.
# Test if support to combine all kinds of logs into one statement. # Test if support to combine all kinds of logs into one statement.
flush error logs, relay logs; flush error logs, relay logs;
# Check the 'master_log.err-old' file is created
# after executed 'flush error logs, relay logs' statement.
# Make sure binary logs was not be flushed # Make sure binary logs was not be flushed
# after execute 'flush error logs, relay logs' statement. # after execute 'flush error logs, relay logs' statement.
# Check the 'slave-relay-bin.000007' file is created after # Check the 'slave-relay-bin.000007' file is created after
...@@ -55,12 +47,8 @@ flush error logs, relay logs; ...@@ -55,12 +47,8 @@ flush error logs, relay logs;
# Make sure the 'slave-relay-bin.000008' and 'slave-relay-bin.000009' # Make sure the 'slave-relay-bin.000008' and 'slave-relay-bin.000009'
# files do not exist before execute 'flush error logs, relay logs' # files do not exist before execute 'flush error logs, relay logs'
# statement. # statement.
# Make sure the 'master_log.err-old' file does not exist
# before execute 'flush logs' statement.
# Test if 'flush logs' statement works fine and flush all the logs. # Test if 'flush logs' statement works fine and flush all the logs.
flush logs; flush logs;
# Check the 'master_log.err-old' file is created
# after executed 'flush logs' statement.
# Check 'master-bin.000003' is created # Check 'master-bin.000003' is created
# after execute 'flush logs' statement. # after execute 'flush logs' statement.
# Check the 'slave-relay-bin.000008' and 'slave-relay-bin.000009' # Check the 'slave-relay-bin.000008' and 'slave-relay-bin.000009'
......
...@@ -9,17 +9,10 @@ ...@@ -9,17 +9,10 @@
connection master; connection master;
# Test 'flush error logs' statement. # Test 'flush error logs' statement.
--echo # Make sure the 'master_log.err-old' file does not
--echo # exist before execute 'flush error logs' statement.
--error 1
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err-old;
--echo # Test if support 'flush error logs' statement. --echo # Test if support 'flush error logs' statement.
flush error logs; flush error logs;
--echo # Check the 'master_log.err-old' file is created
--echo # after executed 'flush error logs' statement.
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err-old;
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err; file_exists $MYSQLTEST_VARDIR/tmp/master_log.err;
--echo # Make sure binary logs was not be flushed --echo # Make sure binary logs was not be flushed
...@@ -109,19 +102,10 @@ sync_slave_with_master; ...@@ -109,19 +102,10 @@ sync_slave_with_master;
file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000007; file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000007;
connection master; connection master;
remove_file $MYSQLTEST_VARDIR/tmp/master_log.err-old;
--echo # Make sure the 'master_log.err-old' file does not exist
--echo # before execute 'flush error logs, relay logs' statement.
--error 1
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err-old;
--echo # Test if support to combine all kinds of logs into one statement. --echo # Test if support to combine all kinds of logs into one statement.
flush error logs, relay logs; flush error logs, relay logs;
--echo # Check the 'master_log.err-old' file is created
--echo # after executed 'flush error logs, relay logs' statement.
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err-old;
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err; file_exists $MYSQLTEST_VARDIR/tmp/master_log.err;
--echo # Make sure binary logs was not be flushed --echo # Make sure binary logs was not be flushed
...@@ -145,19 +129,10 @@ file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000008; ...@@ -145,19 +129,10 @@ file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000008;
file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000009; file_exists $MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.000009;
connection master; connection master;
remove_file $MYSQLTEST_VARDIR/tmp/master_log.err-old;
--echo # Make sure the 'master_log.err-old' file does not exist
--echo # before execute 'flush logs' statement.
--error 1
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err-old;
--echo # Test if 'flush logs' statement works fine and flush all the logs. --echo # Test if 'flush logs' statement works fine and flush all the logs.
flush logs; flush logs;
--echo # Check the 'master_log.err-old' file is created
--echo # after executed 'flush logs' statement.
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err-old;
file_exists $MYSQLTEST_VARDIR/tmp/master_log.err; file_exists $MYSQLTEST_VARDIR/tmp/master_log.err;
--echo # Check 'master-bin.000003' is created --echo # Check 'master-bin.000003' is created
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment