Merge pull request #1136 from tempesta-tech/sysprg/MDEV-18379

MDEV-18379: Unification of check for IPv6

Author: Jan Lindström

mysql-test/suite/galera_3nodes/include/have_ipv6.inc

@@ -4,9 +4,12 @@ VARIABLE_VALUE LIKE '%[::1]%'
 SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 3
 1
+connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
+connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1

mysql-test/suite/galera_3nodes/r/GAL-501.result

@@ -0,0 +1 @@
+--bind-address=::

mysql-test/suite/galera_3nodes/t/GAL-501.opt

@@ -5,7 +5,7 @@
 # ist.recv_addr=[::1]
 
 --source include/galera_cluster.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 
 # Confirm that initial handshake happened over ipv6
 

mysql-test/suite/galera_3nodes/t/GAL-501.test

@@ -1,5 +1,5 @@
 --source include/galera_cluster.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_mariabackup.inc
 
 # Confirm that initial handshake happened over ipv6

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

@@ -1,5 +1,5 @@
 --source include/galera_cluster.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 
 call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to'");
 call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");

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

@@ -1,5 +1,5 @@
 --source include/galera_cluster.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 
 # Confirm that initial handshake happened over ipv6