Merge branch '10.3' into 10.4

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