Fix failing galera tests.

mysql-test/suite/galera/r/MW-292.result

@@ -2,20 +2,28 @@ CREATE TABLE rand_table (f1 FLOAT);
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
 INSERT INTO t1 VALUES (1, 'a');
 INSERT INTO t1 VALUES (2, 'a');
+connection node_1;
 SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE t1 SET f2 = 'b' WHERE f1 = 1;
 SELECT * FROM t1 WHERE f1 = 2 FOR UPDATE;
 f1	f2
 2	a
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_enter_sync';
+connection node_1;
 COMMIT;;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
+connection node_2;
 UPDATE t1 SET f2 = 'c' WHERE f1 = 2;
+connection node_1a;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_enter_sync';
+connection node_1;
 SELECT TIMEDIFF(SYSDATE(), NOW()) < 2;
 TIMEDIFF(SYSDATE(), NOW()) < 2
 1
@@ -26,5 +34,6 @@ COUNT(DISTINCT f1) = 10
 1
 wsrep_local_replays
 1
+connection node_2;
 DROP TABLE t1;
 DROP TABLE rand_table;

mysql-test/suite/galera/r/galera_forced_binlog_format.result

@@ -9,7 +9,7 @@ SET SESSION binlog_format = 'MIXED';
 Warnings:
 Warning	1105	MariaDB Galera does not support binlog format: MIXED
 INSERT INTO t1 VALUES (2);
-SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 249;
+SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 256;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	<Pos>	Gtid_list	1	<End_log_pos>	[]
 mysqld-bin.000001	<Pos>	Binlog_checkpoint	1	<End_log_pos>	mysqld-bin.000001

mysql-test/suite/galera/r/galera_ist_restart_joiner.result

@@ -1,3 +1,5 @@
+connection node_1;
+connection node_2;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
 INSERT INTO t1 VALUES (1, 'a'), (2, 'a'), (3, 'a'), (4, 'a'), (5, 'a'),(6, 'a');
 connection node_2;
@@ -52,3 +54,5 @@ COUNT(*) = 0
 1
 connection node_1;
 DROP TABLE t1, t2, t3;
+disconnect node_2;
+disconnect node_1;

mysql-test/suite/galera/r/galera_split_brain.result

@@ -7,7 +7,7 @@ Killing server ...
 connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-SET GLOBAL wsrep_cluster_address = '';
+connection node_2;
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 disconnect node_2;
 disconnect node_1;

mysql-test/suite/galera/r/galera_transaction_replay.result

@@ -39,6 +39,7 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
 COUNT(*) = 1
 1
 DROP TABLE t1;
+connection node_1;
 CREATE TABLE t1 (i int primary key, j int) ENGINE=INNODB;
 INSERT INTO t1 VALUES (1, 0), (3, 0);
 SELECT * FROM t1;
@@ -46,23 +47,32 @@ i	j
 1	0
 3	0
 PREPARE stmt1 FROM "UPDATE t1 SET j = 1 where i > 0";
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_enter_sync';
+connection node_1;
 EXECUTE stmt1;;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
+connection node_2;
 INSERT INTO t1 VALUES(2,2);
+connection node_1a;
+connection node_1a;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_enter_sync';
+connection node_1;
 SELECT * FROM t1;
 i	j
 1	1
 2	2
 3	1
+connection node_2;
 SELECT * FROM t1;
 i	j
 1	1
 2	2
 3	1
+connection node_1;
 DEALLOCATE PREPARE stmt1;
 DROP TABLE t1;

mysql-test/suite/galera/r/galera_var_cluster_address.result

@@ -1,9 +1,9 @@
 connection node_1;
 connection node_2;
-connection node_1;
+connection node_2;
 SET GLOBAL wsrep_cluster_address = 'foo://';
 SET SESSION wsrep_sync_wait=0;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
+SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
 ERROR 08S01: WSREP has not yet prepared node for application use
 SHOW STATUS LIKE 'wsrep_ready';
 Variable_name	Value
@@ -17,16 +17,14 @@ wsrep_local_state	0
 SHOW STATUS LIKE 'wsrep_local_state_comment';
 Variable_name	Value
 wsrep_local_state_comment	Initialized
-connection node_2;
+connection node_1;
 SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 1
 1
 SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
 VARIABLE_VALUE = 'Primary'
 1
-connection node_1;
 connection node_2;
-SET GLOBAL wsrep_cluster_address = @@wsrep_cluster_address;
 connection node_1;
 SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
 VARIABLE_VALUE = 'Primary'
@@ -34,29 +32,16 @@ VARIABLE_VALUE = 'Primary'
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
-connection node_1;
-SET GLOBAL wsrep_cluster_address = 'gcomm://192.0.2.1';
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
-ERROR 08S01: WSREP has not yet prepared node for application use
-SHOW STATUS LIKE 'wsrep_ready';
-Variable_name	Value
-wsrep_ready	OFF
-SHOW STATUS LIKE 'wsrep_cluster_status';
-Variable_name	Value
-wsrep_cluster_status	non-Primary
-SHOW STATUS LIKE 'wsrep_local_state';
-Variable_name	Value
-wsrep_local_state	0
-SHOW STATUS LIKE 'wsrep_local_state_comment';
-Variable_name	Value
-wsrep_local_state_comment	Initialized
-connection node_1;
 connection node_2;
-SET GLOBAL wsrep_cluster_address = @@wsrep_cluster_address;
-connection node_1;
-SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
-VARIABLE_VALUE = 'Primary'
-1
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
-1
+CALL mtr.add_suppression("Backend not supported: foo");
+CALL mtr.add_suppression("Failed to initialize backend using 'foo");
+CALL mtr.add_suppression("Failed to open channel 'my_wsrep_cluster' at 'foo");
+CALL mtr.add_suppression("gcs connect failed: Socket type not supported");
+CALL mtr.add_suppression("wsrep::connect\\(\\) failed: 7");
+CALL mtr.add_suppression("gcs_caused\\(\\) returned -103 \\(Software caused connection abort\\)");
+CALL mtr.add_suppression("failed to open gcomm backend connection: 110: failed to reach primary view: 110");
+CALL mtr.add_suppression("Failed to open backend connection: -110 \\(Connection timed out\\)");
+CALL mtr.add_suppression("gcs connect failed: Connection timed out");
+CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7");
+disconnect node_2;
+disconnect node_1;

mysql-test/suite/galera/t/galera_forced_binlog_format.test

@@ -20,7 +20,7 @@ INSERT INTO t1 VALUES (2);
 
 --replace_regex /xid=[0-9]+/xid=###/ /table_id: [0-9]+/table_id: ###/
 --replace_column 2 <Pos> 5 <End_log_pos>
-SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 249;
+SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 256;
 
 DROP TABLE t1;
 

mysql-test/suite/galera/t/galera_split_brain.test

@@ -25,11 +25,8 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 
 # Reset the master and restart the slave so that post-test checks can run
 
-SET GLOBAL wsrep_cluster_address = '';
---disable_query_log
---eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig';
---enable_query_log
 
+--connection node_2
 --source include/start_mysqld.inc
 --sleep 5
 --source include/wait_until_connected_again.inc

mysql-test/suite/galera/t/galera_var_cluster_address.test

@@ -6,17 +6,15 @@
 --source include/have_innodb.inc
 
 # Save original auto_increment_offset values.
---connection node_1
-let $auto_increment_offset_node_1 = `SELECT @@global.auto_increment_offset`;
---connection node_2
-let $auto_increment_offset_node_2 = `SELECT @@global.auto_increment_offset`;
-
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
 #
 # Set to invalid value
 # 
 
---connection node_1
---let $wsrep_cluster_address_node1 = `SELECT @@wsrep_cluster_address`
+--connection node_2
+--let $wsrep_cluster_address_node2 = `SELECT @@wsrep_cluster_address`
 SET GLOBAL wsrep_cluster_address = 'foo://';
 
 # With wsrep_sync_wait, this returns an error
@@ -26,7 +24,7 @@ SET GLOBAL wsrep_cluster_address = 'foo://';
 SET SESSION wsrep_sync_wait=0;
 
 --error ER_UNKNOWN_COM_ERROR
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
+SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
 
 # Must return 'OFF'
 SHOW STATUS LIKE 'wsrep_ready';
@@ -38,9 +36,9 @@ SHOW STATUS LIKE 'wsrep_cluster_status';
 SHOW STATUS LIKE 'wsrep_local_state';
 SHOW STATUS LIKE 'wsrep_local_state_comment';
 
---connection node_2
+--connection node_1
 --sleep 1
-# Node #2 thinks that it is now part of a single-node primary cluster 
+# Node #1 thinks that it is now part of a single-node primary cluster 
 SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
 
@@ -48,63 +46,30 @@ SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VA
 # Reset everything as it was
 #
 
---connection node_1
+--connection node_2
 --disable_query_log
---eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_node1';
+--eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_node2';
 --enable_query_log
 
---connection node_2
-SET GLOBAL wsrep_cluster_address = @@wsrep_cluster_address;
-
 --source include/wait_until_connected_again.inc
 
 --connection node_1
 SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
-#
-# Set to invalid host
-#
-
---connection node_1
-SET GLOBAL wsrep_cluster_address = 'gcomm://192.0.2.1';
-
---error ER_UNKNOWN_COM_ERROR
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
-
-# Must return 'OFF'
-SHOW STATUS LIKE 'wsrep_ready';
-
-# Must return 'Non-primary'
-SHOW STATUS LIKE 'wsrep_cluster_status';
-
-# Must return 0 = 'Initialized'
-SHOW STATUS LIKE 'wsrep_local_state';
-SHOW STATUS LIKE 'wsrep_local_state_comment';
-
-#
-# Reset everything as it was
-#
-
---connection node_1
---disable_query_log
---eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_node1';
---enable_query_log
-
 --connection node_2
-SET GLOBAL wsrep_cluster_address = @@wsrep_cluster_address;
---sleep 1
-
---connection node_1
-SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+CALL mtr.add_suppression("Backend not supported: foo");
+CALL mtr.add_suppression("Failed to initialize backend using 'foo");
+CALL mtr.add_suppression("Failed to open channel 'my_wsrep_cluster' at 'foo");
+CALL mtr.add_suppression("gcs connect failed: Socket type not supported");
+CALL mtr.add_suppression("wsrep::connect\\(\\) failed: 7");
+CALL mtr.add_suppression("gcs_caused\\(\\) returned -103 \\(Software caused connection abort\\)");
+CALL mtr.add_suppression("failed to open gcomm backend connection: 110: failed to reach primary view: 110");
+CALL mtr.add_suppression("Failed to open backend connection: -110 \\(Connection timed out\\)");
+CALL mtr.add_suppression("gcs connect failed: Connection timed out");
+CALL mtr.add_suppression("WSREP: wsrep::connect\\(foo://\\) failed: 7");
 
 # Restore original auto_increment_offset values.
---disable_query_log
---connection node_1
---eval SET @@global.auto_increment_offset = $auto_increment_offset_node_1;
---connection node_2
---eval SET @@global.auto_increment_offset = $auto_increment_offset_node_2;
---enable_query_log
-
+--source include/auto_increment_offset_restore.inc
 
+--source include/galera_end.inc

mysql-test/suite/galera_3nodes/r/galera_ist_gcache_rollover.result

@@ -1,13 +1,23 @@
+connection node_1;
+connection node_2;
+connection node_3;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
 INSERT INTO t1 VALUES (01), (02), (03), (04), (05);
+connection node_2;
 Unloading wsrep provider ...
 SET GLOBAL wsrep_provider = 'none';
+connection node_3;
 Unloading wsrep provider ...
 SET GLOBAL wsrep_provider = 'none';
+connection node_1;
 INSERT INTO t1 VALUES (11), (12), (13), (14), (15);
 INSERT INTO t1 VALUES (21), (22), (23), (24), (25);
 SET GLOBAL wsrep_provider_options = 'dbug=d,ist_sender_send_after_get_buffers';
+connection node_2;
+connection node_1;
 INSERT INTO t1 VALUES (31), (32), (33), (34), (35);
+connection node_3;
+connection node_1;
 SHOW STATUS LIKE 'wsrep_debug_sync_waiters';
 Variable_name	Value
 wsrep_debug_sync_waiters	ist_sender_send_after_get_buffers ist_sender_send_after_get_buffers
@@ -19,6 +29,9 @@ INSERT INTO t2 VALUES (REPEAT('x', 512 * 1024));
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'signal=ist_sender_send_after_get_buffers';
 INSERT INTO t1 VALUES (51), (52), (53), (54), (55);
+connection node_2;
+connection node_3;
+connection node_2;
 SELECT COUNT(*) = 30 FROM t1;
 COUNT(*) = 30
 1
@@ -31,6 +44,7 @@ LENGTH(f1) = 512 * 1024
 1
 1
 CALL mtr.add_suppression("WSREP: Unsupported protocol downgrade: incremental data collection disabled");
+connection node_3;
 SELECT COUNT(*) = 30 FROM t1;
 COUNT(*) = 30
 1
@@ -44,3 +58,6 @@ LENGTH(f1) = 512 * 1024
 1
 CALL mtr.add_suppression("WSREP: Unsupported protocol downgrade: incremental data collection disabled");
 DROP TABLE t1, t2;
+disconnect node_3;
+disconnect node_2;
+disconnect node_1;

mysql-test/suite/galera_3nodes/t/galera_ist_gcache_rollover.test

@@ -17,6 +17,12 @@
 --let $galera_server_number = 3
 --source include/galera_connect.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--let $node_3=node_3
+--source ../galera/include/auto_increment_offset_save.inc
+
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
 INSERT INTO t1 VALUES (01), (02), (03), (04), (05);
 
@@ -99,3 +105,9 @@ SELECT LENGTH(f1) = 512 * 1024 FROM t2;
 CALL mtr.add_suppression("WSREP: Unsupported protocol downgrade: incremental data collection disabled");
 
 DROP TABLE t1, t2;
+
+# Restore original auto_increment_offset values.
+--source ../galera/include/auto_increment_offset_restore.inc
+
+--let $galera_cluster_size=3
+--source include/galera_end.inc

plugin/wsrep_info/mysql-test/wsrep_info/r/plugin.result

@@ -2,7 +2,7 @@
 connection node_1;
 SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS;
 NODE_INDEX	NODE_STATUS	CLUSTER_STATUS	CLUSTER_SIZE	CLUSTER_STATE_UUID	CLUSTER_STATE_SEQNO	CLUSTER_CONF_ID	GAP	PROTOCOL_VERSION
-<IDX>	Synced	Primary	2	<CLUSTER_STATE_UUID>	0	2	NO	3
+<IDX>	Synced	Primary	2	<CLUSTER_STATE_UUID>	0	<CLUSTER_CONF_ID>	NO	3
 SELECT * FROM INFORMATION_SCHEMA.WSREP_MEMBERSHIP ORDER BY NAME;
 INDEX	UUID	NAME	ADDRESS
 <IDX>	<MEMBER_ID>	test-node-1	<ADDRESS>
@@ -11,7 +11,7 @@ INDEX	UUID	NAME	ADDRESS
 connection node_2;
 SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS;
 NODE_INDEX	NODE_STATUS	CLUSTER_STATUS	CLUSTER_SIZE	CLUSTER_STATE_UUID	CLUSTER_STATE_SEQNO	CLUSTER_CONF_ID	GAP	PROTOCOL_VERSION
-<IDX>	Synced	Primary	2	<CLUSTER_STATE_UUID>	0	2	YES	3
+<IDX>	Synced	Primary	2	<CLUSTER_STATE_UUID>	0	<CLUSTER_CONF_ID>	YES	3
 SELECT * FROM INFORMATION_SCHEMA.WSREP_MEMBERSHIP ORDER BY NAME;
 INDEX	UUID	NAME	ADDRESS
 <IDX>	<MEMBER_ID>	test-node-1	<ADDRESS>

plugin/wsrep_info/mysql-test/wsrep_info/t/plugin.test

@@ -4,7 +4,7 @@
 --echo # On node 1
 --connection node_1
 
---replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID>
+--replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID> 7 <CLUSTER_CONF_ID>
 SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS;
 
 --replace_column 1 <IDX> 2 <MEMBER_ID> 4 <ADDRESS>
@@ -13,7 +13,7 @@ SELECT * FROM INFORMATION_SCHEMA.WSREP_MEMBERSHIP ORDER BY NAME;
 --echo # On node 2
 --connection node_2
 
---replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID>
+--replace_column 1 <IDX> 5 <CLUSTER_STATE_UUID> 7 <CLUSTER_CONF_ID>
 SELECT * FROM INFORMATION_SCHEMA.WSREP_STATUS;
 
 --replace_column 1 <IDX> 2 <MEMBER_ID> 4 <ADDRESS>