Skip to content

M
mariadb
Commit 3288f266 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

include the correct IPv6 check in perfschema tests

parent 2a0f0867
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 37 deletions
mysql-test/include/have_ipv6.inc deleted 100644 → 0
View file @ 2a0f0867
# 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
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'. # [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
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] Hostname 'santa.claus.ipv6.example.com' does not resolve to '2001:db8::6:6'. # [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
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] IP address '192.0.2.4' could not be resolved: # [Warning] IP address '192.0.2.4' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Enforce a clean state # Enforce a clean state
......
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
View file @ 3288f266
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source include/have_plugin_auth.inc --source include/have_plugin_auth.inc
......
mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
View file @ 3288f266
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Enforce a clean state # Enforce a clean state
......
mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
View file @ 3288f266
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Enforce a clean state # Enforce a clean state
......
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved: # [Warning] IP address '2001:db8::6:6' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved: # [Warning] IP address '2001:db8::6:6' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved: # [Warning] IP address '2001:db8::6:6' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
View file @ 3288f266
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# [Warning] IP address '2001:db8::6:6' could not be resolved: # [Warning] IP address '2001:db8::6:6' could not be resolved:
......
mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
View file @ 3288f266
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Enforce a clean state # Enforce a clean state
......
mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
View file @ 3288f266
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_ipv6.inc --source include/check_ipv6.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Enforce a clean state # Enforce a clean state
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7