Merge commit '10.4' into 10.5

2026-05-16 20:07:13 +02:00 · 2023-07-20 11:54:52 +02:00 · 2023-07-20 11:54:52 +02:00 · f52954ef42
commit f52954ef42
parent f17a865c39 23e252aef2
310 changed files with 5831 additions and 7026 deletions
--- a/mysql-test/suite/galera_3nodes/disabled.def
+++ b/mysql-test/suite/galera_3nodes/disabled.def
@ -14,9 +14,4 @@
 galera_2_cluster : MDEV-29877 Galera test failure on galera_2_cluster
 galera_gtid_2_cluster : MDEV-29877 Galera test failure on galera_2_cluster
 galera_vote_rejoin_mysqldump : MDEV-24481: galera_3nodes.galera_vote_rejoin_mysqldump MTR failed: mysql_shutdown failed
-galera_2_cluster : MDEV-29877 Galera test failure on galera_2_cluster
-galera_gtid_2_cluster : MDEV-29877 Galera test failure on galera_2_cluster
 galera_ssl_reload : MDEV-30172 At line 50: mysql_shutdown failed
-GCF-354 : mysqltest: At line 39: query 'DROP TABLE test.t1' failed: 1047: WSREP has not yet prepared node for application use
-GCF-354 : mysqltest: At line 30: query 'INSERT INTO test.t1 values (1)' failed: 1180: Got error 6 "No such device or address"
-galera_ipv6_mysqldump : mysql_shutdown failed
--- a/mysql-test/suite/galera_3nodes/r/GCF-354.result
+++ b/mysql-test/suite/galera_3nodes/r/GCF-354.result
@ -1,7 +1,5 @@
 connection node_2;
 connection node_1;
-connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
-connection node_3;
 connection node_1;
 connection node_2;
 connection node_3;
--- a/mysql-test/suite/galera_3nodes/r/GCF-363.result
+++ b/mysql-test/suite/galera_3nodes/r/GCF-363.result
@ -1,8 +1,8 @@
 connection node_2;
 connection node_1;
 connection node_1;
-connection node_1;
 connection node_2;
+connection node_3;
 connection node_1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;
 SET GLOBAL wsrep_on=OFF;
@ -12,7 +12,6 @@ connection node_2;
 SET GLOBAL wsrep_on=OFF;
 INSERT INTO t1 VALUES (1, 'a');
 SET GLOBAL wsrep_on=ON;
-connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 connection node_3;
 INSERT INTO t1 VALUES (1, 'b');
 SET SESSION wsrep_sync_wait = 0;
--- a/mysql-test/suite/galera_3nodes/r/GCF-376.result
+++ b/mysql-test/suite/galera_3nodes/r/GCF-376.result
@ -1,10 +1,9 @@
 connection node_2;
 connection node_1;
-connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
-connection node_1;
 connection node_1;
 connection node_2;
 connection node_3;
+connection node_1;
 CREATE TABLE test.t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;
 connection node_2;
 SET GLOBAL wsrep_on=OFF;
@ -16,6 +15,12 @@ INSERT INTO t1 VALUES (1, 'b');
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
 SET SESSION wsrep_sync_wait=0;
 connection node_3;
+SHOW STATUS LIKE 'wsrep_cluster_size';
+Variable_name	Value
+wsrep_cluster_size	2
+SHOW STATUS LIKE 'wsrep_cluster_status';
+Variable_name	Value
+wsrep_cluster_status	Primary
 connection node_2;
 UNLOCK TABLES;
 SET SESSION wsrep_on = ON;
@ -24,6 +29,9 @@ connection node_1;
 SHOW STATUS LIKE 'wsrep_cluster_status';
 Variable_name	Value
 wsrep_cluster_status	non-Primary
+SHOW STATUS LIKE 'wsrep_cluster_size';
+Variable_name	Value
+wsrep_cluster_size	1
 connection node_2;
 SET SESSION wsrep_sync_wait=0;
 SHOW STATUS LIKE 'wsrep_cluster_status';
@ -47,10 +55,21 @@ wsrep_cluster_size	1
 SELECT * FROM t1;
 f1	f2
 1	b
+# reconnect node #1
 connection node_1;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
+# reconnect node #2
 connection node_2;
 # restart
+SHOW STATUS LIKE 'wsrep_cluster_status';
+Variable_name	Value
+wsrep_cluster_status	Primary
+SHOW STATUS LIKE 'wsrep_cluster_size';
+Variable_name	Value
+wsrep_cluster_size	3
+SELECT * FROM t1;
+f1	f2
+1	b
 connection node_1;
 SELECT * FROM t1;
 f1	f2
--- 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,6 +1,9 @@
 connection node_2;
 connection node_1;
 connection node_1;
+connection node_2;
+connection node_3;
+connection node_1;
 CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
 INSERT INTO t1 VALUES (1, 1);
 connection node_2;
--- 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,6 +1,9 @@
 connection node_2;
 connection node_1;
 connection node_1;
+connection node_2;
+connection node_3;
+connection node_1;
 CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
 INSERT INTO t1 VALUES (1, 1);
 connection node_2;
--- a/mysql-test/suite/galera_3nodes/r/galera_pc_bootstrap.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_pc_bootstrap.result
@ -1,17 +1,19 @@
 connection node_2;
 connection node_1;
 call mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg\\(\\).*");
-CREATE TABLE t1 (f1 INTEGER);
 connection node_1;
+connection node_2;
+connection node_3;
+connection node_1;
+CREATE TABLE t1 (f1 INTEGER);
+SET SESSION wsrep_sync_wait=0;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
 connection node_2;
 SET SESSION wsrep_sync_wait=0;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
-connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 connection node_3;
 SET SESSION wsrep_sync_wait=0;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';
-SET SESSION wsrep_sync_wait = 0;
 connection node_2;
 SET GLOBAL wsrep_provider_options = 'pc.bootstrap=1';
 SHOW STATUS LIKE 'wsrep_cluster_size';
--- a/mysql-test/suite/galera_3nodes/t/GAL-501.cnf
+++ b/mysql-test/suite/galera_3nodes/t/GAL-501.cnf
@ -3,7 +3,6 @@
 [mysqld]
 wsrep_sst_method=rsync

-
 [mysqld.1]
 wsrep-cluster-address=gcomm://
 wsrep_node_address=[::1]
--- a/mysql-test/suite/galera_3nodes/t/GAL-501.test
+++ b/mysql-test/suite/galera_3nodes/t/GAL-501.test
@ -4,6 +4,7 @@
 # wsrep_node_address=[::1]
 # ist.recv_addr=[::1]

+--let galera_connection_address=::1
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
 --source include/force_restart.inc
--- a/mysql-test/suite/galera_3nodes/t/GCF-354.cnf
+++ b/mysql-test/suite/galera_3nodes/t/GCF-354.cnf
@ -2,4 +2,4 @@

 [mysqld]
 wsrep-ignore-apply-errors=0
-wsrep_sync_wait=0
+wsrep_sync_wait=0
--- a/mysql-test/suite/galera_3nodes/t/GCF-354.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-354.test
@ -1,8 +1,10 @@
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source include/force_restart.inc

--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
--connection node_3
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc

 # Save original auto_increment_offset values.
 --let $node_1=node_1
@ -101,4 +103,3 @@ CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consens
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");

 --source ../galera/include/auto_increment_offset_restore.inc
-
--- a/mysql-test/suite/galera_3nodes/t/GCF-363.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-363.test
@ -5,10 +5,14 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc

--connection node_1
+--let $galera_connection_name = node_3
+--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

 --connection node_1
@ -26,7 +30,6 @@ SET GLOBAL wsrep_on=OFF;
 INSERT INTO t1 VALUES (1, 'a');
 SET GLOBAL wsrep_on=ON;

--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 --connection node_3
 INSERT INTO t1 VALUES (1, 'b');
 SET SESSION wsrep_sync_wait = 0;
@ -72,4 +75,3 @@ CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 --connection node_1
 # Restore original auto_increment_offset values.
 --source ../galera/include/auto_increment_offset_restore.inc
-
--- a/mysql-test/suite/galera_3nodes/t/GCF-376.test
+++ b/mysql-test/suite/galera_3nodes/t/GCF-376.test
@ -5,8 +5,9 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc

--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
--connection node_1
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc

 # Save original auto_increment_offset values.
 --let $node_1=node_1
@ -14,6 +15,7 @@
 --let $node_3=node_3
 --source ../galera/include/auto_increment_offset_save.inc

+--connection node_1
 CREATE TABLE test.t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1)) ENGINE=InnoDB;

 --connection node_2
@ -36,6 +38,8 @@ SET SESSION wsrep_sync_wait=0;
 --connection node_3
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
 --source include/wait_condition.inc
+SHOW STATUS LIKE 'wsrep_cluster_size';
+SHOW STATUS LIKE 'wsrep_cluster_status';

 --connection node_2
 UNLOCK TABLES;
@ -44,10 +48,17 @@ UNLOCK TABLES;
 --source include/wsrep_wait_disconnect.inc

 --connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
 SHOW STATUS LIKE 'wsrep_cluster_status';
+SHOW STATUS LIKE 'wsrep_cluster_size';

 --connection node_2
 SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Disconnected' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
 SHOW STATUS LIKE 'wsrep_cluster_status';
 SHOW STATUS LIKE 'wsrep_cluster_size';
 SET GLOBAL wsrep_on=OFF;
@ -61,14 +72,23 @@ SHOW STATUS LIKE 'wsrep_cluster_status';
 SHOW STATUS LIKE 'wsrep_cluster_size';
 SELECT * FROM t1;

-# reconnect node #1
+--echo # reconnect node #1
 --connection node_1
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc

-# reconnect node #2
+--echo # reconnect node #2
 --connection node_2
 --source include/restart_mysqld.inc
 --source include/wait_until_connected_again.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+SHOW STATUS LIKE 'wsrep_cluster_status';
+SHOW STATUS LIKE 'wsrep_cluster_size';
+SELECT * FROM t1;

 --connection node_1
 --let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
@ -95,4 +115,4 @@ CALL mtr.add_suppression("Slave SQL: Could not execute Write_rows event on table
 CALL mtr.add_suppression("WSREP: Event (.*) Write_rows_v1 apply failed: 121, seqno ");
 CALL mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on (.*)");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
-CALL mtr.add_suppression("WSREP: Failed to apply write set: ");
+CALL mtr.add_suppression("WSREP: Failed to apply write set: ");
--- a/mysql-test/suite/galera_3nodes/t/galera_2_cluster.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_2_cluster.cnf
@ -22,4 +22,4 @@ server-id=22

 [mysqld.6]
 wsrep_gtid_domain_id=2
-server-id=23
+server-id=23
--- a/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
@ -10,7 +10,6 @@
 --let $galera_connection_name = node_3
 --let $galera_server_number = 3
 --source include/galera_connect.inc
--let $wsrep_cluster_address_node3 = `SELECT @@wsrep_cluster_address`

 # Save original auto_increment_offset values.
 --let $node_1=node_1
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.cnf
@ -3,7 +3,6 @@
 [mysqld]
 wsrep_sst_method=mariabackup
 wsrep_sst_auth="root:"
-bind-address=::

 [mysqld.1]
 wsrep-cluster-address=gcomm://
@ -12,6 +11,7 @@ wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
 wsrep_node_name=node_1
+bind-address=::

 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -21,6 +21,7 @@ wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
 wsrep_node_name=node_2
 wsrep_sst_donor=node_1
+bind-address=::

 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -30,6 +31,7 @@ wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
 wsrep_node_name=node_3
 wsrep_sst_donor=node_1
+bind-address=::

 [SST]
 transferfmt=@ENV.MTR_GALERA_TFMT
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test
@ -1,3 +1,4 @@
+--let galera_connection_address=::1
 --source include/big_test.inc
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.cnf
@ -3,11 +3,9 @@
 # decoy value - should not be read by mysqld or sst scripts
 [mysqld]
 innodb-data-home-dir=/tmp
-bind-address=::
 innodb-data-home-dir=
 wsrep_sst_method=mariabackup
 wsrep_sst_auth="root:"
-bind-address=::

 [mysqld.1]
 wsrep-cluster-address=gcomm://
@ -16,6 +14,7 @@ wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
 wsrep_node_name=node_1
+bind-address=::

 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -25,6 +24,7 @@ wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
 wsrep_node_name=node_2
 wsrep_sst_donor=node_1
+bind-address=::

 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -34,6 +34,7 @@ wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
 wsrep_node_name=node_3
 wsrep_sst_donor=node_1
+bind-address=::

 [SST]
 transferfmt=@ENV.MTR_GALERA_TFMT
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test
@ -1,3 +1,4 @@
+--let galera_connection_address=::1
 --source include/big_test.inc
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.cnf
@ -2,7 +2,6 @@

 [mysqld]
 wsrep_sst_method=rsync
-bind-address=::

 [mysqld.1]
 wsrep-cluster-address=gcomm://
@ -10,6 +9,7 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.1.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
+bind-address=::

 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -17,6 +17,7 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.2.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.2.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
+bind-address=::

 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -24,3 +25,4 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.3.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.3.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
+bind-address=::
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
@ -1,3 +1,4 @@
+--let galera_connection_address=::1
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
 --source include/force_restart.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.cnf
@ -2,7 +2,6 @@

 [mysqld]
 wsrep_sst_method=rsync
-bind-address=::

 [mysqld.1]
 wsrep-cluster-address=gcomm://
@ -10,6 +9,7 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.1.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
+bind-address=::

 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -17,6 +17,7 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.2.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.2.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
+bind-address=::

 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -24,3 +25,4 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.3.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.3.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
+bind-address=::
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.test
@ -1,3 +1,4 @@
+--let galera_connection_address=::1
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
 --source include/force_restart.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync_section.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync_section.cnf
@ -7,7 +7,6 @@ innodb-data-home-dir=/tmp
 [mysqld]
 innodb-data-home-dir=
 wsrep_sst_method=rsync
-bind-address=::

 [mysqld.1]
 wsrep-cluster-address=gcomm://
@ -15,6 +14,7 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.1.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
+bind-address=::

 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -22,6 +22,7 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.2.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.2.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
+bind-address=::

 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
@ -29,3 +30,4 @@ wsrep_provider_options='base_host=[::1];base_port=@mysqld.3.#galera_port;gmcast.
 wsrep_sst_receive_address='[::1]:@mysqld.3.#sst_port'
 wsrep_node_address=::1
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
+bind-address=::
--- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync_section.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync_section.test
@ -1,3 +1,4 @@
+--let galera_connection_address=::1
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
 --source include/force_restart.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_A.test
@ -15,6 +15,7 @@
 --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
--- a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_B.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_B.test
@ -15,6 +15,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
+
 --connection node_1
 --let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --source include/wait_condition.inc
@ -271,3 +277,5 @@ call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State T

 --connection node_3
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+
+--source ../galera/include/auto_increment_offset_restore.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_C.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_join_with_cc_C.test
@ -14,6 +14,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
+
 --connection node_1
 --let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --source include/wait_condition.inc
@ -297,3 +303,5 @@ call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State T

 --connection node_3
 call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
+
+--source ../galera/include/auto_increment_offset_restore.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_pc_bootstrap.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_pc_bootstrap.test
@ -1,17 +1,35 @@
 #
 # Test the operation of pc.bootstrap 
 #
-
 --source include/big_test.inc
 --source include/galera_cluster.inc
 --source include/have_innodb.inc

 call mtr.add_suppression("WSREP: gcs/src/gcs_core.cpp:core_handle_uuid_msg\\(\\).*");

+#
+# Create connection node_3 and save auto increment variables.
+#
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc
+
+--let $node_1 = node_1
+--let $node_2 = node_2
+--let $node_3 = node_3
+
+--source ../galera/include/auto_increment_offset_save.inc
+
+--connection node_1
+
 CREATE TABLE t1 (f1 INTEGER);

+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
 # Force all nodes to become non-primary
--connection node_1
+
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';

 --connection node_2
@ -21,7 +39,6 @@ SET SESSION wsrep_sync_wait=0;

 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';

--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 --connection node_3
 SET SESSION wsrep_sync_wait=0;
 --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
@ -29,13 +46,16 @@ SET SESSION wsrep_sync_wait=0;

 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=1';

+# Node #3 should be non-primary
+--let $wait_condition = SELECT variable_value = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+
+--connection node_2
 # Node #2 should be non-primary
-SET SESSION wsrep_sync_wait = 0;
 --let $wait_condition = SELECT variable_value = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_cluster_status';
 --source include/wait_condition.inc

 # Signal node #2 to bootstrap
--connection node_2
 SET GLOBAL wsrep_provider_options = 'pc.bootstrap=1';

 # Wait until node becomes available for queries again
@ -97,3 +117,8 @@ SELECT COUNT(*) FROM t1;

 # Test cleanup
 DROP TABLE t1;
+
+#
+# Restore auto increment variables.
+#
+--source ../galera/include/auto_increment_offset_restore.inc
--- a/mysql-test/suite/galera_3nodes/t/galera_pc_weight.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_pc_weight.cnf
@ -3,5 +3,3 @@
 # interactions with following tests such as
 # galera_3nodes.galera_var_dirty_reads2
 !include ../galera_3nodes.cnf
-
-!include ../galera_3nodes.cnf
--- a/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test
+++ b/mysql-test/suite/galera_3nodes/t/inconsistency_shutdown.test
@ -76,6 +76,8 @@ SET GLOBAL wsrep_on=OFF;
 --source include/start_mysqld.inc
 --source include/galera_wait_ready.inc

+--let $wait_condition = SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
 DROP TABLE t1;

 #
@ -100,6 +102,8 @@ CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 INT);
 SET GLOBAL wsrep_provider_options='gcs.fc_limit=1K';
 # Introduce inconsistency
 SET wsrep_on=OFF;
+--let $wait_condition = SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2';
+--source include/wait_condition.inc
 DROP TABLE t2;
 SET wsrep_on=ON;

@ -171,6 +175,9 @@ SET GLOBAL wsrep_on=OFF;
 --source include/start_mysqld.inc
 --source include/galera_wait_ready.inc

+--let $wait_condition = SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+
 DROP TABLE t1;

 CALL mtr.add_suppression('Can\'t find record in \'t1\'');