Bug#26519582: GR_SINGLE_PRIMARY_ASYNC_AFTER_GR_SECONDARY FAILING ON HUDSON

Issue:
======
The testcase failing because of concurrent DDL statement execution. The change
master which is executed on server2 is blocked by create table (initially
executed on server1) when applied on server2 as it had higher priority.

Solution:
=========
Move create table on server1 below change master statement on server2, so they
are not executed concurrently.

Author: Hemant Dangi

rapid/plugin/group_replication/tests/mtr/r/gr_single_primary_async_after_gr_secondary.result

@@ -10,22 +10,25 @@ include/start_and_bootstrap_group_replication.inc
 [connection server2]
 include/start_group_replication.inc
 
-# 2. Add some data to server1 & 3
+# 2. Create new channel ch3_2: server2(slave), server3(master)
+[connection server2]
+CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=SERVER_3_PORT for channel 'ch3_2';
+Warnings:
+Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+
+# 3. Add some data to server1 & 3
 [connection server1]
 CREATE TABLE test.t1 (c1 INT NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO test.t1 VALUES (1);
 [connection server3]
 CREATE TABLE test.t2 (c1 INT NOT NULL) ENGINE=InnoDB;
 INSERT INTO test.t2 VALUES (1);
 
-# 3. Create new channel ch3_2: server2(slave), server3(master)
-[connection server2]
-CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=SERVER_3_PORT for channel 'ch3_2';
-Warnings:
-Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1760	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+# 4. Verify the error scenarios.
 
 # 4.1 start slave and verify for error ER_SLAVE_FATAL_ERROR
+[connection server2]
 START SLAVE FOR CHANNEL 'ch3_2';
 include/wait_for_slave_io_error.inc [errno=1593]
 include/wait_for_slave_sql_error.inc [errno=1593]

rapid/plugin/group_replication/tests/mtr/t/gr_single_primary_async_after_gr_secondary.test

@@ -5,8 +5,8 @@
 # Test:
 #
 # 1. Start GR on server1 & 2.
-# 2. Add some data to server1 & 3.
-# 3. Create new channel ch3_2: server2(slave), server3(master).
+# 2. Create new channel ch3_2: server2(slave), server3(master).
+# 3. Add some data to server1 & 3.
 # 4. Verify for following scenarios:
 #    1. start slave and and verify for
 #       ER_GROUP_REPLICATION_CONFIGURATION error.
@@ -40,7 +40,16 @@
 --source include/start_group_replication.inc
 
 --echo
---echo # 2. Add some data to server1 & 3
+--echo # 2. Create new channel ch3_2: server2(slave), server3(master)
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
+--replace_result $SERVER_MYPORT_3 SERVER_3_PORT
+--eval CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=$SERVER_MYPORT_3 for channel 'ch3_2'
+
+
+--echo
+--echo # 3. Add some data to server1 & 3
 
 # server1: create table t1 and add data
 --let $rpl_connection_name= server1
@@ -56,13 +65,7 @@ INSERT INTO test.t2 VALUES (1);
 
 
 --echo
---echo # 3. Create new channel ch3_2: server2(slave), server3(master)
---let $rpl_connection_name= server2
---source include/rpl_connection.inc
-
---replace_result $SERVER_MYPORT_3 SERVER_3_PORT
---eval CHANGE MASTER TO MASTER_HOST='localhost', MASTER_USER='root', MASTER_PORT=$SERVER_MYPORT_3 for channel 'ch3_2'
-
+--echo # 4. Verify the error scenarios.
 
 # variables for wait_for_slave_io_error.inc and wait_for_slave_sql_error.inc
 --let $rpl_channel_name=ch3_2
@@ -77,6 +80,9 @@ INSERT INTO test.t2 VALUES (1);
 
 --echo
 --echo # 4.1 start slave and verify for error ER_SLAVE_FATAL_ERROR
+--let $rpl_connection_name= server2
+--source include/rpl_connection.inc
+
 START SLAVE FOR CHANNEL 'ch3_2';
 --source include/wait_for_slave_io_error.inc
 --source include/wait_for_slave_sql_error.inc