MDEV-6536: galera IPv6 tests to connect using IPv6

grooverdan · grooverdan · commit d2dce1c9456e · 2021-03-05T08:25:52.000+11:00
diff --git a/mysql-test/include/galera_connect.inc b/mysql-test/include/galera_connect.inc
@@ -11,6 +11,9 @@
 # $galera_connection_name
 #   Name of the resulting connection.
 #
+# $galera_connection_address
+#   IP to connect to for galera (defaults to 127.0.0.1)
+#
 # $galera_server_number
 #   Sequence number of the node in the galera cluster.
 #
@@ -28,6 +31,11 @@ if (!$galera_server_number)
   --die ERROR IN TEST: $galera_server_number must be set before sourcing include/galera_connect.inc
 }
 
+if (!$galera_connection_address)
+{
+  --let $galera_connection_address= 127.0.0.1
+}
+
 --let $_galera_port= \$NODE_MYPORT_$galera_server_number
 if (!$_galera_port)
 {
@@ -38,7 +46,7 @@ if (!$_galera_port)
 if ($galera_debug)
 {
 --disable_query_log
-  --echo connect($galera_connection_name,127.0.0.1,root,,test,$_galera_port,)
+  --echo connect($galera_connection_name,$galera_connection_address,root,,test,$_galera_port,)
 --enable_query_log
 }
 
@@ -47,5 +55,5 @@ if ($galera_debug)
 
 # Open a connection
 --disable_query_log
---connect($galera_connection_name,127.0.0.1,root,,test,$_galera_port,)
+--connect($galera_connection_name,$galera_connection_address,root,,test,$_galera_port,)
 --enable_query_log
diff --git 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
diff --git 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/galera_cluster.inc
 --source include/check_ipv6.inc
 --source include/have_innodb.inc
diff --git 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/galera_cluster.inc
 --source include/check_ipv6.inc
 --source include/have_innodb.inc
diff --git 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
diff --git 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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`# $galera_connection_name`
`12`	`12`	`# Name of the resulting connection.`
`13`	`13`	`#`
	`14`	`+# $galera_connection_address`
	`15`	`+# IP to connect to for galera (defaults to 127.0.0.1)`
	`16`	`+#`
`14`	`17`	`# $galera_server_number`
`15`	`18`	`# Sequence number of the node in the galera cluster.`
`16`	`19`	`#`
`@@ -28,6 +31,11 @@ if (!$galera_server_number)`
`28`	`31`	`--die ERROR IN TEST: $galera_server_number must be set before sourcing include/galera_connect.inc`
`29`	`32`	`}`
`30`	`33`
	`34`	`+if (!$galera_connection_address)`
	`35`	`+{`
	`36`	`+ --let $galera_connection_address= 127.0.0.1`
	`37`	`+}`
	`38`	`+`
`31`	`39`	`--let $_galera_port= \$NODE_MYPORT_$galera_server_number`
`32`	`40`	`if (!$_galera_port)`
`33`	`41`	`{`
`@@ -38,7 +46,7 @@ if (!$_galera_port)`
`38`	`46`	`if ($galera_debug)`
`39`	`47`	`{`
`40`	`48`	`--disable_query_log`
`41`		`- --echo connect($galera_connection_name,127.0.0.1,root,,test,$_galera_port,)`
	`49`	`+ --echo connect($galera_connection_name,$galera_connection_address,root,,test,$_galera_port,)`
`42`	`50`	`--enable_query_log`
`43`	`51`	`}`
`44`	`52`
`@@ -47,5 +55,5 @@ if ($galera_debug)`
`47`	`55`
`48`	`56`	`# Open a connection`
`49`	`57`	`--disable_query_log`
`50`		`---connect($galera_connection_name,127.0.0.1,root,,test,$_galera_port,)`
	`58`	`+--connect($galera_connection_name,$galera_connection_address,root,,test,$_galera_port,)`
`51`	`59`	`--enable_query_log`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+--let galera_connection_address=::1`
`1`	`2`	`--source include/galera_cluster.inc`
`2`	`3`	`--source include/check_ipv6.inc`
`3`	`4`	`--source include/have_innodb.inc`