Merge branch 'mysql-5.6' into mysql-5.7

Author: Sujatha Sivakumar

mysql-test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test

@@ -95,11 +95,8 @@ DELETE FROM d3.t1 where a=3;
 --let $rpl_server_parameters= --skip_slave_start=FALSE --relay_log_info_repository=TABLE --master_info_repository=TABLE --sync_master_info=1 --relay-log-recovery=1
 --source include/rpl_restart_server.inc
 
-# Wait for slave thread to apply all events
---let $show_statement= SHOW PROCESSLIST
---let $field= State
---let $condition= = 'Slave has read all relay log; waiting for more updates';
---source include/wait_show_condition.inc
+--source include/rpl_connection_master.inc
+--source include/sync_slave_sql_with_master.inc
 
 # Compare the tables on master and slave they should be in sync
 let $i=4;

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

@@ -65,6 +65,8 @@ DELETE FROM d1.t1 where a=1;
 DELETE FROM d2.t1 where a=2;
 DELETE FROM d3.t1 where a=3;
 include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --skip_slave_start=FALSE --relay_log_info_repository=TABLE --master_info_repository=TABLE --sync_master_info=1 --relay-log-recovery=1]
+[connection master]
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:d4.t1, slave:d4.t1]
 include/diff_tables.inc [master:d3.t1, slave:d3.t1]
 include/diff_tables.inc [master:d2.t1, slave:d2.t1]
@@ -134,6 +136,8 @@ DELETE FROM d1.t1 where a=1;
 DELETE FROM d2.t1 where a=2;
 DELETE FROM d3.t1 where a=3;
 include/rpl_restart_server.inc [server_number=2 gtids=on parameters: --skip_slave_start=FALSE --relay_log_info_repository=TABLE --master_info_repository=TABLE --sync_master_info=1 --relay-log-recovery=1]
+[connection master]
+include/sync_slave_sql_with_master.inc
 include/diff_tables.inc [master:d4.t1, slave:d4.t1]
 include/diff_tables.inc [master:d3.t1, slave:d3.t1]
 include/diff_tables.inc [master:d2.t1, slave:d2.t1]