Commit d2dce1c9 authored by Daniel Black's avatar Daniel Black

MDEV-6536: galera IPv6 tests to connect using IPv6

parent b3abcf80
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
# $galera_connection_name # $galera_connection_name
# Name of the resulting connection. # Name of the resulting connection.
# #
# $galera_connection_address
# IP to connect to for galera (defaults to 127.0.0.1)
#
# $galera_server_number # $galera_server_number
# Sequence number of the node in the galera cluster. # Sequence number of the node in the galera cluster.
# #
...@@ -28,6 +31,11 @@ if (!$galera_server_number) ...@@ -28,6 +31,11 @@ if (!$galera_server_number)
--die ERROR IN TEST: $galera_server_number must be set before sourcing include/galera_connect.inc --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 --let $_galera_port= \$NODE_MYPORT_$galera_server_number
if (!$_galera_port) if (!$_galera_port)
{ {
...@@ -38,7 +46,7 @@ if (!$_galera_port) ...@@ -38,7 +46,7 @@ if (!$_galera_port)
if ($galera_debug) if ($galera_debug)
{ {
--disable_query_log --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 --enable_query_log
} }
...@@ -47,5 +55,5 @@ if ($galera_debug) ...@@ -47,5 +55,5 @@ if ($galera_debug)
# Open a connection # Open a connection
--disable_query_log --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 --enable_query_log
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# wsrep_node_address=[::1] # wsrep_node_address=[::1]
# ist.recv_addr=[::1] # ist.recv_addr=[::1]
--let galera_connection_address=::1
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/check_ipv6.inc --source include/check_ipv6.inc
--source include/force_restart.inc --source include/force_restart.inc
......
--let galera_connection_address=::1
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/check_ipv6.inc --source include/check_ipv6.inc
--source include/have_innodb.inc --source include/have_innodb.inc
......
--let galera_connection_address=::1
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/check_ipv6.inc --source include/check_ipv6.inc
--source include/have_innodb.inc --source include/have_innodb.inc
......
--let galera_connection_address=::1
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/check_ipv6.inc --source include/check_ipv6.inc
--source include/force_restart.inc --source include/force_restart.inc
......
--let galera_connection_address=::1
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/check_ipv6.inc --source include/check_ipv6.inc
--source include/force_restart.inc --source include/force_restart.inc
......
--let galera_connection_address=::1
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/check_ipv6.inc --source include/check_ipv6.inc
--source include/force_restart.inc --source include/force_restart.inc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment