Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY

Bug#319  if while a non-transactional slave is replicating a transaction possible problem

only testing related: addressing reviewers' comments.

mysql-test/suite/bugs/r/rpl_bug38205.result:
  new results.
mysql-test/suite/bugs/t/rpl_bug38205.test:
  changing output per reviewer's offering.
mysql-test/suite/rpl/r/rpl_start_stop_slave.result:
  new results.
mysql-test/suite/rpl/t/rpl_start_stop_slave.test:
  refining tests for Bug #38205, Bug#319 to start slave with the necessary synchronization;
  changing output per reviewer's offering;
  removing redundant wait for stop.

4 files changed, 9 insertions, 8 deletions

diff --git a/mysql-test/suite/bugs/r/rpl_bug38205.result b/mysql-test/suite/bugs/r/rpl_bug38205.result
index 195c0ca1135..8f1dee344fa 100644
--- a/mysql-test/suite/bugs/r/rpl_bug38205.result
+++ b/mysql-test/suite/bugs/r/rpl_bug38205.result
@@ -44,7 +44,7 @@ zero
 0
 stop slave sql_thread;
 rollback;
-*** sql thread is running: No ***
+*** sql thread is *not* running: No ***
 *** the prove: the stopped slave has rolled back the current transaction ***
 zero
 0
diff --git a/mysql-test/suite/bugs/t/rpl_bug38205.test b/mysql-test/suite/bugs/t/rpl_bug38205.test
index f754d7481c7..52b36636e79 100644
--- a/mysql-test/suite/bugs/t/rpl_bug38205.test
+++ b/mysql-test/suite/bugs/t/rpl_bug38205.test
@@ -1,5 +1,6 @@
 #
 # Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY
+# Bug#319  if while a non-transactional slave is replicating a transaction possible problem 
 #
 # Verifying the fact that STOP SLAVE in the middle of a group execution waits
 # for the end of the group before the slave sql thread will stop.
@@ -143,7 +144,7 @@ connection slave1;
 reap;
 source include/wait_for_slave_sql_to_stop.inc;
 let $sql_status= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1);
---echo *** sql thread is running: $sql_status ***
+--echo *** sql thread is *not* running: $sql_status ***
 
 let $pos1_slave= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);
 
diff --git a/mysql-test/suite/rpl/r/rpl_start_stop_slave.result b/mysql-test/suite/rpl/r/rpl_start_stop_slave.result
index 130b65c704c..e2b1935c268 100644
--- a/mysql-test/suite/rpl/r/rpl_start_stop_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_start_stop_slave.result
@@ -28,7 +28,7 @@ zero
 0
 stop slave;
 rollback;
-*** sql thread is running: No ***
+*** sql thread is *not* running: No ***
 *** the prove: the stopped slave has finished the current transaction ***
 five
 5
@@ -36,5 +36,5 @@ zero
 0
 one
 1
-start slave;
+include/start_slave.inc
 drop table t1i, t2m;
diff --git a/mysql-test/suite/rpl/t/rpl_start_stop_slave.test b/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
index 529ed7acb32..d9b87427321 100644
--- a/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_start_stop_slave.test
@@ -38,7 +38,8 @@ sync_with_master;
 
 
 #
-# Bug #38205 Row-based Replication (RBR) causes inconsistencies...
+# Bug#38205 Row-based Replication (RBR) causes inconsistencies...
+# Bug#319   if while a non-transactional slave is replicating a transaction...
 #
 # Verifying that STOP SLAVE does not interrupt excution of a group
 # execution of events if the group can not roll back.
@@ -93,14 +94,13 @@ connection slave1;
 reap;
 source include/wait_for_slave_to_stop.inc;
 let $sql_status= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1);
---echo *** sql thread is running: $sql_status ***
+--echo *** sql thread is *not* running: $sql_status ***
 
 
 connection master;
 let $pos1_master= query_get_value(SHOW MASTER STATUS, Position, 1);
 
 connection slave;
-source include/wait_for_slave_sql_to_stop.inc;
 
 let $pos1_slave= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);
 
@@ -112,7 +112,7 @@ eval select $pos1_master - $pos1_slave as zero;
 eval select $pos1_slave > $pos0_slave as one;
 --enable_query_log
 
-start slave;
+source include/start_slave.inc;
 
 # clean-up
 connection master;