galera_3nodes tests correctedbb-10.6-merge-julius

5 files changed, 17 insertions, 6 deletions

diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.cnf b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.cnf
index 415a8f33257..ed0e6204d3e 100644
--- 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
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.cnf b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.cnf
index 21f229ffcce..49365737008 100644
--- 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,11 @@
 # decoy value - should not be read by mysqld or sst scripts
 [mysqld]
 innodb-data-home-dir=/tmp
-bind-address=::
+# just for test - overriden by sections for specific nodes:
+bind-address=127.0.0.1
 innodb-data-home-dir=
 wsrep_sst_method=mariabackup
 wsrep_sst_auth="root:"
-bind-address=::
 
 [mysqld.1]
 wsrep-cluster-address=gcomm://
@@ -16,6 +16,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 +26,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 +36,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
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.cnf b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.cnf
index afdfacfa3a5..0a54fb8e4e1 100644
--- 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=::
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.cnf b/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.cnf
index afdfacfa3a5..0a54fb8e4e1 100644
--- 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=::
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync_section.cnf b/mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync_section.cnf
index c34144d9a69..35196700044 100644
--- 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=::