mysql · akopytov · Jun 23, 2015
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv6.example.com");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv6.example.com");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'.
 # [Note] Hostname 'santa.claus.ipv6.example.com' has the following IP addresses:
 # [Note]  - 2001:db8::6:7e

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'.
 # [Note] Hostname 'santa.claus.ipv6.example.com' has the following IP addresses:
 # [Note]  - 2001:db8::6:7e

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] IP address '192.0.2.4' could not be resolved:
 # no reverse address mapping.
 call mtr.add_suppression("192.0.2.4");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
 # Name or service not known
 call mtr.add_suppression("santa.claus.ipv6.example.com");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
 # Name or service not known
 call mtr.add_suppression("santa.claus.ipv6.example.com");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin-master.opt
@@ -1,3 +1,2 @@
---bind-address=::
 $PLUGIN_AUTH_OPT
 $PLUGIN_AUTH_LOAD
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
@@ -14,6 +14,10 @@
 --source include/have_perfschema.inc
 --source include/have_plugin_auth.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
@@ -13,6 +13,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
@@ -13,6 +13,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] IP address '2001:db8::6:6' could not be resolved:
 # Temporary failure in name resolution
 call mtr.add_suppression("2001:db8::6:6");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] IP address '2001:db8::6:6' could not be resolved:
 # Temporary failure in name resolution
 call mtr.add_suppression("2001:db8::6:6");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] IP address '2001:db8::6:6' could not be resolved:
 # Name or service not known
 call mtr.add_suppression("2001:db8::6:6");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
@@ -11,6 +11,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # [Warning] IP address '2001:db8::6:6' could not be resolved:
 # Name or service not known
 call mtr.add_suppression("2001:db8::6:6");

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
@@ -10,6 +10,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc

diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl-master.opt
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
@@ -10,6 +10,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
+# Start the server with --bind-address=::
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 --source ../include/hostcache_set_state.inc

diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix.cnf b/mysql-test/suite/rpl/t/rpl_ip_mix.cnf
@@ -10,7 +10,6 @@
 log-bin=                 master-bin
 
 skip-name-resolve
-bind-address=               ::
 
 
 [mysqld.2]

diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix.test b/mysql-test/suite/rpl/t/rpl_ip_mix.test
@@ -1,10 +1,16 @@
 # Test of ipv6 format, especially "change master host=..."
-# Options: --skip-name-resolve, master: --bind-address=::, slave: --bind-address=0.0.0.0
+# Options: --skip-name-resolve, slave: --bind-address=0.0.0.0
 # (see corresponding cnf file)
 #
 --source include/check_ipv6.inc
 --source include/have_log_bin.inc
 
+# restart master with --bind-address=::
+--connect (master,localhost,root,,test,$MASTER_MYPORT)
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+--disconnect master
+
 let $IPv6= ::1;
 --echo #################### IP: $IPv6 ###########################
 --source include/rpl_ip_mix.inc

diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix2.cnf b/mysql-test/suite/rpl/t/rpl_ip_mix2.cnf
@@ -35,7 +35,6 @@ report-user=                root
 
 skip-slave-start
 skip-name-resolve
-bind-address=               ::
 
 # Directory where slaves find the dumps generated by "load data"
 # on the server. The path need to have constant length otherwise

diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix2.test b/mysql-test/suite/rpl/t/rpl_ip_mix2.test
@@ -1,5 +1,5 @@
 # Test of ipv6 format, especially "change master host=..."
-# Options: --skip-name-resolve, master: --bind-address=0.0.0.0, slave: --bind-address=::
+# Options: --skip-name-resolve, master: --bind-address=0.0.0.0
 # (see corresponding cnf file)
 #
 # Check if ipv6 is available. If not, server is crashing (see BUG#48915).
@@ -17,6 +17,12 @@ disconnect checkcon123456789;
 # end check
 --source include/have_log_bin.inc
 
+# restart slave with --bind-address=::
+--connect (slave,localhost,root,,test,$SLAVE_MYPORT)
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+--disconnect slave
+
 let $IPv6= ::1;
 --echo #################### IP: $IPv6 ###########################
 --source include/rpl_ip_mix2.inc

diff --git a/mysql-test/suite/rpl/t/rpl_ipv6.cnf b/mysql-test/suite/rpl/t/rpl_ipv6.cnf
@@ -10,7 +10,6 @@
 log-bin=                 master-bin
 
 skip-name-resolve
-bind-address=               ::
 
 
 [mysqld.2]
@@ -35,7 +34,6 @@ report-user=                root
 
 skip-slave-start
 skip-name-resolve
-bind-address=               ::
 
 # Directory where slaves find the dumps generated by "load data"
 # on the server. The path need to have constant length otherwise

diff --git a/mysql-test/suite/rpl/t/rpl_ipv6.test b/mysql-test/suite/rpl/t/rpl_ipv6.test
@@ -7,6 +7,17 @@
 --source include/not_windows.inc
 --source include/have_log_bin.inc
 
+# restart both master and slave with --bind-address=::
+--connect (master,localhost,root,,test,$MASTER_MYPORT)
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+--connect (slave,localhost,root,,test,$SLAVE_MYPORT)
+--let $restart_parameters = "--bind-address=::"
+--source include/restart_mysqld.inc
+
+--disconnect master
+--disconnect slave
+
 let $IPv6= ::1;
 --echo #################### IP: $IPv6 ###########################
 --source include/rpl_ipv6.inc

diff --git a/mysql-test/t/wl6301_3-master.opt b/mysql-test/t/wl6301_3-master.opt
diff --git a/mysql-test/t/wl6301_3.test b/mysql-test/t/wl6301_3.test
@@ -4,13 +4,17 @@
 # 3. Check that if the server is bound to the IPv4-mapped IPv6-address,
 # the server accepts client connections from both IPv4 and IPv6 worlds.
 #
-# Options: --skip-name-resolve, --bind-address=::ffff:127.0.0.1
-# (see corresponding opt file).
-#
 
 # Can't be tested with embedded server
 --source include/not_embedded.inc
 
+# Can't be tested without IPv6 support
+--source include/have_ipv6.inc
+
+# Start the server with --bind-address=::ffff:127.0.0.1
+--let $restart_parameters = "--skip-name-resolve --bind-address=::ffff:127.0.0.1"
+--source include/restart_mysqld.inc
+
 # The box should support IPv4-mapped addresses
 --source include/have_ipv4_mapped.inc