Re-record MTR tests galera_3nodes.galera_join_with_cc_{A|B|C}

3 files changed, 126 insertions, 0 deletions

diff --git a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result
index 0461f1f1feb..a60e2bbb6cc 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result
@@ -1,40 +1,81 @@
+connection node_2;
+connection node_1;
+connection node_1;
 CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
 INSERT INTO t1 VALUES (1, 1);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (2, 3);
+connection node_2;
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 SET wsrep_sync_wait = 0;
 SET wsrep_on = OFF;
 SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (3, 2);
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_3;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (4, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (5, 2);
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,before_send_state_request';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (6, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (7, 2);
+connection node_3;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (8, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'signal=before_send_state_request';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_2;
 INSERT INTO t1 VALUES (9, 2);
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
 SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 DROP TABLE t1;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+connection node_2;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+connection node_3;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result
index d878f60ca6b..7e75bc4b08a 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result
@@ -1,18 +1,39 @@
+connection node_2;
+connection node_1;
+connection node_1;
 CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
 INSERT INTO t1 VALUES (1, 1);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (2, 3);
+connection node_2;
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 SET wsrep_sync_wait = 0;
 SET wsrep_on = OFF;
 SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (3, 2);
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_3;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (4, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (5, 2);
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,before_send_state_request';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
 SET SESSION wsrep_on = 0;
@@ -24,18 +45,35 @@ SET SESSION wsrep_on = 0;
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters';
 VARIABLE_NAME	VARIABLE_VALUE
 WSREP_DEBUG_SYNC_WAITERS	after_shift_to_joining
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (6, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (7, 2);
+connection node_3;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (8, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_2;
 INSERT INTO t1 VALUES (9, 2);
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
@@ -44,7 +82,10 @@ VARIABLE_NAME	VARIABLE_VALUE
 WSREP_DEBUG_SYNC_WAITERS	process_primary_configuration
 SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 DROP TABLE t1;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+connection node_2;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+connection node_3;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
diff --git a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result
index df0a924029c..ea10edfc62c 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result
@@ -1,44 +1,85 @@
+connection node_2;
+connection node_1;
+connection node_1;
 CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
 INSERT INTO t1 VALUES (1, 1);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (2, 3);
+connection node_2;
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 SET wsrep_sync_wait = 0;
 SET wsrep_on = OFF;
 SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (3, 2);
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_3;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (4, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (5, 2);
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,before_send_state_request';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
 SET GLOBAL wsrep_provider_options = 'signal=before_send_state_request';
 4
 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters';
 VARIABLE_NAME	VARIABLE_VALUE
 WSREP_DEBUG_SYNC_WAITERS	
+connection node_3;
 INSERT INTO t1 VALUES (6, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
 INSERT INTO t1 VALUES (7, 2);
+connection node_3;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'dbug=d,process_primary_configuration';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_2;
+connection node_3;
 INSERT INTO t1 VALUES (8, 3);
+connection node_2;
+connection node_1;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
+connection node_2;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
+connection node_2;
 INSERT INTO t1 VALUES (9, 2);
+connection node_3;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
@@ -48,8 +89,11 @@ SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
+connection node_1;
 DROP TABLE t1;
 call mtr.add_suppression("WSREP: Send action {\(.*\), STATE_REQUEST} returned -107 \\(Transport endpoint is not connected\\)");
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+connection node_2;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+connection node_3;
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");