include the correct IPv6 check in perfschema tests

mysql-test/include/have_ipv6.inc

@@ -1,20 +0,0 @@
-# Check if ipv6 is available.
-#
---disable_query_log
---disable_result_log
---disable_abort_on_error
-connect (checkcon123456789,::1,root,,test);
-if($mysql_errno)
-{
-    skip No IPv6 support;
-}
-connection default;
-if(!$mysql_errno)
-{
-  disconnect checkcon123456789;
-}
---enable_abort_on_error
---enable_result_log
---enable_query_log
-# end check
-

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'.

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'.

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] IP address '192.0.2.4' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # Enforce a clean state

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test

@@ -10,7 +10,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 --source include/have_plugin_auth.inc
 

mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test

@@ -10,7 +10,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # Enforce a clean state

mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test

@@ -10,7 +10,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # Enforce a clean state

mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] IP address '2001:db8::6:6' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] IP address '2001:db8::6:6' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] IP address '2001:db8::6:6' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test

@@ -8,7 +8,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # [Warning] IP address '2001:db8::6:6' could not be resolved:

mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test

@@ -7,7 +7,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # Enforce a clean state

mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test

@@ -7,7 +7,7 @@
 
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_ipv6.inc
+--source include/check_ipv6.inc
 --source include/have_perfschema.inc
 
 # Enforce a clean state