Merge branch 'mysql-5.6' into mysql-5.7

Author: vpvenugo

mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result

@@ -57,6 +57,7 @@ include/assert_grep.inc [Found a message about the long GTIDs in the slave error
 CHANGE MASTER TO MASTER_LOG_FILE = 'MASTER_FILE', MASTER_LOG_POS = MASTER_POS, MASTER_AUTO_POSITION = 0;
 include/start_slave.inc
 include/assert.inc [t1 should contain only one row with the value 2]
+include/stop_slave.inc
 include/assert_grep.inc [Found warning containing lost GTIDs in the master error log.]
 include/assert_grep.inc [Found warning containing lost GTIDs in the slave error log.]
 [connection master]
@@ -67,7 +68,6 @@ CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missin
 # 7) Cleanup.
 #
 [connection slave]
-include/stop_slave.inc
 RESET MASTER;
 RESET SLAVE;
 [connection master]

mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test

@@ -133,6 +133,7 @@ eval CHANGE MASTER TO MASTER_LOG_FILE = '$master_file', MASTER_LOG_POS = $master
 --let $assert_text= t1 should contain only one row with the value 2
 --let $assert_cond= "[SELECT COUNT(*) FROM t1]" = "1" AND "[SELECT * FROM t1]" = "2"
 --source include/assert.inc
+--source include/stop_slave.inc
 
 # Verify that warning about the missing transactions are logged into the master's error log.
 --let $assert_file=$MYSQLTEST_VARDIR/log/mysqld.1.err
@@ -160,7 +161,6 @@ CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missin
 --echo # 7) Cleanup.
 --echo #
 --source include/rpl_connection_slave.inc
---source include/stop_slave.inc
 RESET MASTER;
 RESET SLAVE;
 --source include/rpl_connection_master.inc