Merge branch '10.3' into 10.4

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.%';
-

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

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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'

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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.%';

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;

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

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

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

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:

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:

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.

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.

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

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

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

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

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

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

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

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

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.

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.

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

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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:

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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:

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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.

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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';

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

@@ -1 +1,2 @@
+--disable-skip-name-resolve
 --bind-address=::

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

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

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;

mysql-test/suite/perfschema/t/stage_mdl_global-master.opt

@@ -1 +0,0 @@
---query_cache_type=1

mysql-test/suite/perfschema/t/stage_mdl_global.opt

@@ -0,0 +1,2 @@
+--query-cache-size=1048576
+--query-cache-type=OFF