diff options
Diffstat (limited to 'mysql-test/suite/perfschema')
95 files changed, 70 insertions, 447 deletions
diff --git a/mysql-test/suite/perfschema/include/hostcache_set_state.inc b/mysql-test/suite/perfschema/include/hostcache_set_state.inc index 25dd56a4e0d..29f321236bd 100644 --- a/mysql-test/suite/perfschema/include/hostcache_set_state.inc +++ b/mysql-test/suite/perfschema/include/hostcache_set_state.inc @@ -9,10 +9,10 @@ flush privileges; # Print critical setup -select @@global.debug; -select @@global.max_connect_errors; -select @@global.max_user_connections; -select @@global.max_connections; +#select @@global.debug; +#select @@global.max_connect_errors; +#select @@global.max_user_connections; +#select @@global.max_connections; # Make sure there are no remaining records that can change the test outcome @@ -20,4 +20,3 @@ select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; select `User`, `Host` from mysql.`user` where `user` like '192.%'; select `User`, `Host` from mysql.`user` where `user` like '2001:%'; select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; - diff --git a/mysql-test/suite/perfschema/include/stage_setup.inc b/mysql-test/suite/perfschema/include/stage_setup.inc index 85ade046939..683c4561c15 100644 --- a/mysql-test/suite/perfschema/include/stage_setup.inc +++ b/mysql-test/suite/perfschema/include/stage_setup.inc @@ -121,10 +121,12 @@ begin where thread_id = my_thread_id and nesting_event_id = my_statement_id order by event_id asc; + # Ignore query cache as it may not be enabled select username, event_name, nesting_event_type from performance_schema.events_stages_history where thread_id = my_thread_id - and nesting_event_id = my_statement_id + and nesting_event_id = my_statement_id and + event_name not like "%query cache%" order by event_id asc; end; else diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result index 0abbc7326dc..27243b52422 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result index c2ec1e1d1e4..7879919b09d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result index fd286dc4c24..1d5923483c9 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result index d4887df429d..87fc75817df 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result index 684897a3b38..949fa8f9c3e 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result index 7f6de0de46d..b2e0fb60811 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result index 1f8345a8315..bfc7fde5be8 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result index 3f069d515be..41eb9636e31 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result index 9a85430a6d7..22dd7e7632c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result index 011af9b2eaa..f301df94ce6 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result index cfc6c8e4f66..14a6ace09e4 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result index 357aa07f08d..6cca75f9775 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -1024 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result index 7963bed8213..6d278da3812 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result index 3852a675f81..abe9a606bc4 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result index f42a300e6ea..18986674491 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result index d1ce2ac0c25..88ac817ce17 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result index 683376fb088..a5f70873ed9 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result index 353c4a55772..86e7bf5780b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result index 93bcca91300..42d86e858fb 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result index d386d30c2d7..87e97ba2138 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result index 41006170ab4..bcd47243d03 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result index d67f8cce707..5c24a86248a 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result index ccb3c7564f2..68ea9a1d826 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result index 01a70fd2183..5b1f546b30e 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result index b4f1a39fcce..0a3a3329c1e 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result index 22271f4ba5f..493ada909b7 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result index dea4d07f593..a36d1442ee6 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result index 5f9f47fc8da..7cfb6f87277 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result index 8fe9a0954a3..f9d2b556804 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -1024 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; @@ -22,8 +10,8 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%'; User Host select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; User Host -select @@global.max_connections into @saved_max_connections; -select @@global.max_user_connections into @saved_max_user_connections; +SET @saved_max_connections=@@global.max_connections; +SET @saved_max_user_connections=@@global.max_user_connections; create user 'quota'@'santa.claus.ipv6.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv6.example.com'; grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com' diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result index baddc88b116..6d98c2cc186 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result index 59891d359ff..22ce0c3e809 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result index 9e88dcf66b3..a78ba09513c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result index 7bbff5f30db..da1570f1b37 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result @@ -3,18 +3,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result index d35dc133015..a4cc3eeb0d0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result index 03be70e1553..75f8e5391cf 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result index 35b11567252..ddb44157f44 100644 --- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result +++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result @@ -2,18 +2,6 @@ flush status; flush hosts; flush user_resources; flush privileges; -select @@global.debug; -@@global.debug - -select @@global.max_connect_errors; -@@global.max_connect_errors -100 -select @@global.max_user_connections; -@@global.max_user_connections -0 -select @@global.max_connections; -@@global.max_connections -151 select `User`, `Host` from mysql.`user` where `host` like '%\\%%'; User Host select `User`, `Host` from mysql.`user` where `user` like '192.%'; diff --git a/mysql-test/suite/perfschema/r/query_cache.result b/mysql-test/suite/perfschema/r/query_cache.result index 837c2573a72..ae64c90582c 100644 --- a/mysql-test/suite/perfschema/r/query_cache.result +++ b/mysql-test/suite/perfschema/r/query_cache.result @@ -1,3 +1,4 @@ +set @save_query_cache_size=@@query_cache_size; drop table if exists t1; create table t1 (a int not null); insert into t1 values (1), (2), (3); @@ -63,6 +64,6 @@ Qcache_inserts 1 show status like "Qcache_hits"; Variable_name Value Qcache_hits 1 -SET GLOBAL query_cache_size= default; +SET GLOBAL query_cache_size=@save_query_cache_size; drop table t1; flush status; diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result index 11531124cae..aab68fa7cc7 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_global.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result @@ -9,7 +9,6 @@ user1 statement/sql/flush flush tables with read lock username event_name nesting_event_type username event_name nesting_event_type user1 stage/sql/Init STATEMENT -user1 stage/sql/Waiting for query cache lock STATEMENT user1 stage/sql/Init STATEMENT user1 stage/sql/Query end STATEMENT user1 stage/sql/Commit STATEMENT diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test index df82a5c047d..6bed01e50bf 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test @@ -1,4 +1,3 @@ - # # Tests for the performance_schema host_cache. # @@ -9,6 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved: # Temporary failure in name resolution diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test index f99cbc80577..3c72de8a05e 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved: # Temporary failure in name resolution diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test index 08cbe8d15af..5cbe4c30530 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Hostname 'santa.claus.ipv4.example.com' does not resolve to '192.0.2.4'. # [Note] Hostname 'santa.claus.ipv4.example.com' has the following IP addresses: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test index 2f5f12fe0ab..c0639cd6b86 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Hostname 'santa.claus.ipv4.example.com' does not resolve to '192.0.2.4'. # [Note] Hostname 'santa.claus.ipv4.example.com' has the following IP addresses: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test index 808a1b927d7..3b69e0731a0 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # no reverse address mapping. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test index b46661c6852..e6478c13951 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # no reverse address mapping. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test index 6f763d8c666..b4b11526af6 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved: # Name or service not known diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test index eb69c2a5365..06f0f7d29ee 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv4.example.com' could not be resolved: # Name or service not known diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test index da2a2bbc725..325460e66ba 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test @@ -12,6 +12,7 @@ --source include/have_debug.inc --source include/have_perfschema.inc --source include/have_plugin_auth.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test index b18dcd5f494..6990a4e7118 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test @@ -11,6 +11,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test index 4766dbef778..b37bfc79ada 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test @@ -8,6 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # Name or service not known diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test index 4eb630f6350..c0349184506 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test @@ -11,6 +11,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test index ab72e0f4340..187879985c9 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # Temporary failure in name resolution diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test index 6152399503b..a78c0dab4eb 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # Temporary failure in name resolution diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test index 06776de6b27..23ecd51eb4f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # no reverse address mapping. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test index 72bb7fac6af..4b6c91c3df3 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test @@ -9,6 +9,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # no reverse address mapping. diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test index b39f3478146..ea331647b48 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test @@ -8,6 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test index de58219d490..2b949098bad 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test @@ -8,6 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index f276e759f75..11c45724f70 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # Temporary failure in name resolution 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index a5ac18a8818..bdbc0e3c025 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # Temporary failure in name resolution 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 9f951273e98..1eb0d3ec41f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.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: 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 361a3ce6bd1..f8a3cc23c00 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.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: 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 81427e86c5e..6493bb61a1a 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '192.0.2.4' could not be resolved: # no reverse address mapping. 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 4836dfc2d36..065ae02dd49 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 7ce12639b7f..9ebafc9627d 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # Name or service not known 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 9ce4fb926e6..136b3c7a24f 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] Host name 'santa.claus.ipv6.example.com' could not be resolved: # Name or service not known 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 index c2bb4d156af..063beb402d7 100644 --- 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 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test index 9c8168e573a..3a822bfacb3 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test @@ -12,6 +12,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc --source include/have_plugin_auth.inc # Enforce a clean state diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt index c2bb4d156af..063beb402d7 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked-master.opt @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 4b2088ce37f..a80feadb230 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt @@ -1,2 +1,3 @@ +--disable-skip-name-resolve --bind-address=:: --max-user-connections=1024 diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test index 8948ea45e37..b14fff1cc72 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test @@ -12,13 +12,14 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc --source ../include/hostcache_set_state.inc -select @@global.max_connections into @saved_max_connections; -select @@global.max_user_connections into @saved_max_user_connections; +SET @saved_max_connections=@@global.max_connections; +SET @saved_max_user_connections=@@global.max_user_connections; create user 'quota'@'santa.claus.ipv6.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv6.example.com'; 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 7e49ed62b93..b44b58eb0d5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: # Temporary failure in name resolution 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 3cdd87e4cf9..073451c7e75 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: # Temporary failure in name resolution 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 62876e859cb..a7b1a961f09 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: # Name or service not known 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 index c2bb4d156af..063beb402d7 100644 --- 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 @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: 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 index 054940e4a02..5c3d643b166 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test @@ -10,6 +10,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # [Warning] IP address '2001:db8::6:6' could not be resolved: # Name or service not known diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt index c2bb4d156af..063beb402d7 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd-master.opt @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test index 811c5c51c26..7dcfbb922e5 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test @@ -9,6 +9,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.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 index c2bb4d156af..063beb402d7 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl-master.opt +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl-master.opt @@ -1 +1,2 @@ +--disable-skip-name-resolve --bind-address=:: diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test index c11922624c6..3ea4451c7aa 100644 --- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test +++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test @@ -9,6 +9,7 @@ --source include/have_debug.inc --source include/check_ipv6.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc diff --git a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test index 9e5c88b8bd5..65f33ce73a8 100644 --- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test +++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test @@ -8,6 +8,7 @@ --source include/not_embedded.inc --source include/have_debug.inc --source include/have_perfschema.inc +--source include/have_hostname_cache.inc # Enforce a clean state --source ../include/wait_for_pfs_thread_count.inc diff --git a/mysql-test/suite/perfschema/t/query_cache.test b/mysql-test/suite/perfschema/t/query_cache.test index 802e574f89b..4c130813611 100644 --- a/mysql-test/suite/perfschema/t/query_cache.test +++ b/mysql-test/suite/perfschema/t/query_cache.test @@ -7,6 +7,8 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +set @save_query_cache_size=@@query_cache_size; + --disable_warnings drop table if exists t1; --enable_warnings @@ -50,7 +52,7 @@ show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; show status like "Qcache_hits"; -SET GLOBAL query_cache_size= default; +SET GLOBAL query_cache_size=@save_query_cache_size; drop table t1; flush status; diff --git a/mysql-test/suite/perfschema/t/stage_mdl_global-master.opt b/mysql-test/suite/perfschema/t/stage_mdl_global-master.opt deleted file mode 100644 index a00258bc48c..00000000000 --- a/mysql-test/suite/perfschema/t/stage_mdl_global-master.opt +++ /dev/null @@ -1 +0,0 @@ ---query_cache_type=1 diff --git a/mysql-test/suite/perfschema/t/stage_mdl_global.opt b/mysql-test/suite/perfschema/t/stage_mdl_global.opt new file mode 100644 index 00000000000..ca3d8a72f9f --- /dev/null +++ b/mysql-test/suite/perfschema/t/stage_mdl_global.opt @@ -0,0 +1,2 @@ +--query-cache-size=1048576 +--query-cache-type=OFF |