Fix try.

3 files changed, 91 insertions, 5 deletions

diff --git a/mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf b/mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf
index 477789175fb..34ef09875ea 100644
--- a/mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf
+++ b/mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf
@@ -28,6 +28,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#gale
 wsrep_sst_receive_address=127.0.0.2:@mysqld.1.#sst_port
 wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
+wsrep-on=1
 
 [mysqld.2]
 #galera_port=@OPT.port
@@ -39,6 +40,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#gale
 wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port
 wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
+wsrep-on=1
 
 [mysqld.3]
 #galera_port=@OPT.port
@@ -50,6 +52,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.3.#gale
 wsrep_sst_receive_address=127.0.0.2:@mysqld.3.#sst_port
 wsrep_node_incoming_address=127.0.0.1:@mysqld.3.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.3.#sst_port'
+wsrep-on=1
 
 
 [mysqld.4]
@@ -64,6 +67,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.4.#gale
 wsrep_sst_receive_address=127.0.0.2:@mysqld.4.#sst_port
 wsrep_node_incoming_address=127.0.0.1:@mysqld.4.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.4.#sst_port'
+wsrep-on=1
 
 [mysqld.5]
 wsrep_cluster_name=cluster2
@@ -76,6 +80,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.5.#gale
 wsrep_sst_receive_address=127.0.0.2:@mysqld.5.#sst_port
 wsrep_node_incoming_address=127.0.0.1:@mysqld.5.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.5.#sst_port'
+wsrep-on=1
 
 [mysqld.6]
 wsrep_cluster_name=cluster2
@@ -88,6 +93,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.6.#gale
 wsrep_sst_receive_address=127.0.0.2:@mysqld.6.#sst_port
 wsrep_node_incoming_address=127.0.0.1:@mysqld.6.port
 wsrep_sst_receive_address='127.0.0.1:@mysqld.6.#sst_port'
+wsrep-on=1
 
 [ENV]
 NODE_MYPORT_1= @mysqld.1.port
diff --git a/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result b/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
index 35ca84119e7..43064cf6441 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
@@ -1,27 +1,38 @@
+connection node_1;
 cluster 1 node 1
 SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
+connection node_2;
 cluster 1 node 2
 SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
+connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
+connection node_3;
 cluster 1 node 3
 SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
+connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4;
+connection node_4;
 cluster 2 node 1
 SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
+connect node_5, 127.0.0.1, root, , test, $NODE_MYPORT_5;
+connection node_5;
 cluster 2 node 2
 SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
+connect node_6, 127.0.0.1, root, , test, $NODE_MYPORT_6;
+connection node_6;
 cluster 2 node 3
 SHOW STATUS LIKE 'wsrep_cluster_size';
 Variable_name	Value
 wsrep_cluster_size	3
+connection node_1;
 change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_4, master_use_gtid=current_pos, ignore_server_ids=(12,13);;
 start slave;
 include/wait_for_slave_to_start.inc
@@ -31,6 +42,7 @@ select @@gtid_binlog_state;
 select @@gtid_slave_pos;
 @@gtid_slave_pos
 
+connection node_4;
 change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos, ignore_server_ids=(22,23);;
 start slave;
 include/wait_for_slave_to_start.inc
@@ -41,15 +53,19 @@ select @@gtid_slave_pos;
 @@gtid_slave_pos
 
 cluster 1 node 1
+connection node_1;
 create table t1 (cluster_domain_id int ,node_server_id int, seq_no int);
 insert into t1 values (1, 11, 2);
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 2 node 1
+connection node_4;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2
@@ -62,31 +78,40 @@ cluster_domain_id	node_server_id	seq_no
 1	11	2
 2	21	1
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 1 node 2
+connection node_2;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
-1-11-2,2-21-1
+1-11-2
 insert into t1 values (1, 12, 3);
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2,1-12-3,2-21-1
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 1 node 3
+connection node_3;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
-1-11-2,1-12-3,2-21-1
+1-11-2,2-21-1
 insert into t1 values (1, 13, 4);
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 2 node 2
+connection node_5;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1
@@ -95,9 +120,12 @@ select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2
 #wait for sync  cluster 2 and 1
+connection node_4;
 include/save_master_gtid.inc
+connection node_1;
 include/sync_with_master_gtid.inc
 cluster 2 node 3
+connection node_6;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2
@@ -106,9 +134,12 @@ select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2,2-23-3
 #wait for sync  cluster 2 and 1
+connection node_4;
 include/save_master_gtid.inc
+connection node_1;
 include/sync_with_master_gtid.inc
 cluster 1 node 1
+connection node_1;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2,2-23-3
@@ -119,15 +150,21 @@ change master to master_use_gtid=no, ignore_server_ids=();
 reset master;
 set global GTID_SLAVE_POS="";
 cluster 2 node 1
+connection node_4;
 stop slave;
 reset slave;
 change master to master_use_gtid=no, ignore_server_ids=();
 reset master;
 set global GTID_SLAVE_POS="";
+connection node_2;
 reset master;
+connection node_3;
 reset master;
+connection node_5;
 reset master;
+connection node_6;
 reset master;
+connection node_1;
 change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_6, master_use_gtid=current_pos, ignore_server_ids=(12,13);;
 start slave;
 include/wait_for_slave_to_start.inc
@@ -137,6 +174,7 @@ select @@gtid_binlog_state;
 select @@gtid_slave_pos;
 @@gtid_slave_pos
 
+connection node_4;
 change master to master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_3, master_use_gtid=current_pos, ignore_server_ids=(22,23);;
 start slave;
 include/wait_for_slave_to_start.inc
@@ -147,15 +185,19 @@ select @@gtid_slave_pos;
 @@gtid_slave_pos
 
 cluster 1 node 1
-create table t1 (cluster_domain_id int ,node_server_id int, seq_no int);
+connection node_1;
+create table t1 (cluster_domain_id int not null,node_server_id int not null, seq_no int not null, primary key(cluster_domain_id, node_server_id,seq_no)) engine=innodb;
 insert into t1 values (1, 11, 2);
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 2 node 1
+connection node_4;
 insert into t1 values (2, 21, 1);
 select @@gtid_binlog_state;
 @@gtid_binlog_state
@@ -165,9 +207,12 @@ cluster_domain_id	node_server_id	seq_no
 1	11	2
 2	21	1
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 1 node 2
+connection node_2;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2,2-21-1
@@ -176,9 +221,12 @@ select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2,1-12-3,2-21-1
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 1 node 3
+connection node_3;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-11-2,1-12-3,2-21-1
@@ -187,9 +235,12 @@ select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1
 #wait for sync  cluster 1 and 2
+connection node_1;
 include/save_master_gtid.inc
+connection node_4;
 include/sync_with_master_gtid.inc
 cluster 2 node 2
+connection node_5;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1
@@ -198,9 +249,12 @@ select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2
 #wait for sync  cluster 2 and 1
+connection node_4;
 include/save_master_gtid.inc
+connection node_1;
 include/sync_with_master_gtid.inc
 cluster 2 node 3
+connection node_6;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2
@@ -209,9 +263,12 @@ select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2,2-23-3
 #wait for sync  cluster 2 and 1
+connection node_4;
 include/save_master_gtid.inc
+connection node_1;
 include/sync_with_master_gtid.inc
 cluster 1 node 1
+connection node_1;
 select @@gtid_binlog_state;
 @@gtid_binlog_state
 1-12-3,1-11-2,1-13-4,2-21-1,2-22-2,2-23-3
@@ -221,11 +278,24 @@ change master to master_use_gtid=no, ignore_server_ids=();
 reset master;
 set global GTID_SLAVE_POS="";
 cluster 2 node 1
+connection node_4;
 stop slave;
 change master to master_use_gtid=no, ignore_server_ids=();
 reset master;
 set global GTID_SLAVE_POS="";
+connection node_2;
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
+connection node_3;
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
+connection node_5;
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
+connection node_6;
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
diff --git a/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test b/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
index c679db1305d..2bb8d06462c 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
@@ -10,7 +10,7 @@
 
 --source include/big_test.inc
 --source include/galera_cluster.inc
---source include/have_innodb.inc
+--source include/force_restart.inc
 
 --connection node_1
 --echo cluster 1 node 1
@@ -29,6 +29,7 @@ SHOW STATUS LIKE 'wsrep_cluster_size';
 --connection node_4
 --echo cluster 2 node 1
 SHOW STATUS LIKE 'wsrep_cluster_size';
+call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log.*");
 
 --connect node_5, 127.0.0.1, root, , test, $NODE_MYPORT_5
 --connection node_5
@@ -193,7 +194,7 @@ select @@gtid_slave_pos;
 
 --echo cluster 1 node 1
 --connection node_1
-create table t1 (cluster_domain_id int ,node_server_id int, seq_no int);
+create table t1 (cluster_domain_id int not null,node_server_id int not null, seq_no int not null, primary key(cluster_domain_id, node_server_id,seq_no)) engine=innodb;
 insert into t1 values (1, 11, 2);
 
 select @@gtid_binlog_state;
@@ -283,10 +284,19 @@ reset master;
 set global GTID_SLAVE_POS="";
 
 --connection node_2
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
 --connection node_3
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
 --connection node_5
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
 --connection node_6
+set session wsrep_on=off;
 reset master;
+set session wsrep_on=on;
+