Merge branch '10.0' into 10.1

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

@@ -130,7 +130,7 @@ SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
 a	b
 30	conservative
 31	conservative
-include/save_master_pos.inc
+include/save_master_gtid.inc
 include/sync_with_master_gtid.inc
 SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
 a	b
@@ -150,7 +150,7 @@ a	b
 31	conservative
 32	optimistic
 33	optimistic
-include/save_master_pos.inc
+include/save_master_gtid.inc
 include/start_slave.inc
 include/sync_with_master_gtid.inc
 SELECT * FROM t1 WHERE a >= 30 ORDER BY a;

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

@@ -226,7 +226,7 @@ SET SESSION debug_dbug= @old_dbug;
 INSERT INTO t1 SELECT a, "conservative" FROM t4;
 DROP TEMPORARY TABLE t4;
 SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
---source include/save_master_pos.inc
+--source include/save_master_gtid.inc
 
 --connection server_2
 --source include/sync_with_master_gtid.inc
@@ -245,7 +245,7 @@ INSERT INTO t1 SELECT a, "optimistic" FROM t4;
 DROP TEMPORARY TABLE t4;
 
 SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
---source include/save_master_pos.inc
+--source include/save_master_gtid.inc
 
 --connection server_2
 --source include/start_slave.inc