Fix that multi_source tests did not reset @@global.gtid_pos between tests.

mysql-test/suite/multi_source/reset_master_slave.inc

@@ -23,6 +23,7 @@ while ($con_name != 'No such row')
 
 --error 0,ER_FLUSH_MASTER_BINLOG_CLOSED
 reset master;
+set global gtid_pos='';
 eval set default_master_connection = '$default_master';
 
 --source include/end_include_file.inc

mysql-test/suite/multi_source/simple.result

@@ -11,8 +11,8 @@ include/wait_for_slave_to_start.inc
 set default_master_connection = '';
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Using_Gtid	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Pos
-slave1	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	311	mysqld-relay-bin-slave1.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			1	0	0	1073741824	7	0	60.000	0-1-3
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			2	0	0	1073741824	7	0	60.000	0-1-3
+slave1	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	311	mysqld-relay-bin-slave1.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			1	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			2	0	0	1073741824	7	0	60.000	
 start all slaves;
 stop slave 'slave1';
 show slave 'slave1' status;
@@ -60,18 +60,18 @@ Using_Gtid	0
 reset slave 'slave1';
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Using_Gtid	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Pos
-slave1			127.0.0.1	root	MYPORT_1	60		4		599		No	No							0		0	0	904	None		0	No						NULL	No	0		0			1	0	0	1073741824	7	0	60.000	0-1-3
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			2	0	0	1073741824	7	0	60.000	0-1-3
+slave1			127.0.0.1	root	MYPORT_1	60		4		599		No	No							0		0	0	904	None		0	No						NULL	No	0		0			1	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			2	0	0	1073741824	7	0	60.000	
 reset slave 'slave1' all;
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Using_Gtid	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Pos
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			2	0	0	1073741824	7	0	60.000	0-1-3
+slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	Yes	Yes							0		0	311	904	None		0	No						0	No	0		0			2	0	0	1073741824	7	0	60.000	
 stop all slaves;
 Warnings:
 Note	1938	SLAVE 'slave2' stopped
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Using_Gtid	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Pos
-slave2			127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	No	No							0		0	311	904	None		0	No						NULL	No	0		0			2	0	0	1073741824	7	0	60.000	0-1-3
+slave2			127.0.0.1	root	MYPORT_2	60	master-bin.000001	311	mysqld-relay-bin-slave2.000002	599	master-bin.000001	No	No							0		0	311	904	None		0	No						NULL	No	0		0			2	0	0	1073741824	7	0	60.000	
 stop all slaves;
 include/reset_master_slave.inc
 include/reset_master_slave.inc