summaryrefslogtreecommitdiff
path: root/mysql-test/include/galera_connect.inc
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-03-04 11:19:26 +1100
committerDaniel Black <daniel@mariadb.org>2021-03-05 08:25:52 +1100
commitd2dce1c9456ecf731ba86f0c6ae954c70750fbb0 (patch)
tree2e8ae8b93e8b475515ada8f6ad90edcbbe3125c2 /mysql-test/include/galera_connect.inc
parentb3abcf80a1be71502c1e25e0feb40ccea4648f4e (diff)
downloadmariadb-git-d2dce1c9456ecf731ba86f0c6ae954c70750fbb0.tar.gz
MDEV-6536: galera IPv6 tests to connect using IPv6
Diffstat (limited to 'mysql-test/include/galera_connect.inc')
-rw-r--r--mysql-test/include/galera_connect.inc12
1 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/include/galera_connect.inc b/mysql-test/include/galera_connect.inc
index a40b03bf421..5e72cf9ed23 100644
--- 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