BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave

For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.


mysql-test/r/rpl_loaddata2.result:
  Cleanup
mysql-test/r/rpl_redirect.result:
  Cleanup
mysql-test/r/rpl_slave_status.result:
  Cleanup
mysql-test/t/rpl_LD_INFILE.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave

1 files changed, 23 insertions, 2 deletions

diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test
index 985cebabe7e..a4a276b63d6 100644
--- a/mysql-test/t/rpl_slave_status.test
+++ b/mysql-test/t/rpl_slave_status.test
@@ -1,11 +1,21 @@
-# Test case for BUG #10780
 --source include/master-slave.inc
+
+############################################################################
+# Test case for BUG#10780
+#
+# REQUIREMENT
+#   A slave without replication privileges should have Slave_IO_Running = No
+
+# 1. Create new replication user
 connection master;
 grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl';
+
 connection slave;
 stop slave;
 change master to master_user='rpl',master_password='rpl';
 start slave;
+
+# 2. Do replication as new user
 connection master;
 --disable_warnings
 drop table if exists t1;
@@ -16,12 +26,19 @@ save_master_pos;
 connection slave;
 sync_with_master;
 select * from t1;
+
+# 3. Delete new replication user
 connection master;
 delete from mysql.user where user='rpl';
 flush privileges;
 connection slave;
+
+# 4. Restart slave without privileges
+# (slave.err will contain access denied error for this START SLAVE command)
 stop slave;
 start slave;
+
+# 5. Make sure Slave_IO_Running = No
 --replace_result $MASTER_MYPORT MASTER_MYPORT
 # Column 1 is replaced, since the output can be either
 # "Connecting to master" or "Waiting for master update"
@@ -29,8 +46,12 @@ start slave;
 --vertical_results
 show slave status;
 
+# Cleanup (Note that slave IO thread is not running)
+connection slave;
+drop table t1;
 connection master;
 drop table t1;
-sync_with_master;
+
+# end of test case for BUG#10780
 
 # end of 4.1 tests