List:Commits« Previous MessageNext Message »
From:Marc Alff Date:March 21 2012 10:06am
Subject:bzr push into mysql-trunk branch (marc.alff:3810 to 3811) Bug#13812227
View as plain text  
 3811 Marc Alff	2012-03-21
      Bug#13812227 - HOSTCACHE_IPV4_NAMEINFO_AGAIN_DENY FAILS SPORADICALLY ON PB2
      
      Test script change only.
      
      Improved the test scripts robustness by better enforcement of initial conditions,
      to prevent spurious failures.

    added:
      mysql-test/suite/perfschema/include/hostcache_set_state.inc
    modified:
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
      mysql-test/suite/perfschema/r/hostcache_peer_addr.result
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_format.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
      mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
      mysql-test/suite/perfschema/t/hostcache_peer_addr.test
 3810 Alfranio Correia	2012-03-21
      BUG#13868465 - ER_AUTO_POSITION_REQUIRES_GTID_MODE_ON PRINTS OUT A WRONG MESSAGE
      
      "CHANGE MASTER TO" accepts the option MASTER_AUTO_POSITION in order to
      enable auto_position when gtid is on. Howerver, if one tries to issue
      "CHANGE MASTER TO MASTER_AUTO_POSITION" when gtid is off, the following
      error message is printed out:
      
      CHANGE MASTER TO AUTO_POSITION = 1 can only be executed when GTID_MODE = ON.
      
      There is a typo in the error message as AUTO_POSITION does not exit.

    modified:
      mysql-test/suite/rpl/r/rpl_gtid_mode.result
      sql/share/errmsg-utf8.txt
=== added file 'mysql-test/suite/perfschema/include/hostcache_set_state.inc'
--- a/mysql-test/suite/perfschema/include/hostcache_set_state.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/include/hostcache_set_state.inc	2012-03-21 10:04:20 +0000
@@ -0,0 +1,23 @@
+# Helper for hostcache_*.test
+
+# Set a known initial state for the test
+
+flush status;
+flush hosts;
+flush user_resources;
+flush privileges;
+
+# Print critical setup
+
+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
+
+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.%';
+

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'192.0.2.4';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'192.0.2.4';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'192.0.2.4';
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-03-21 10:04:20 +0000
@@ -1,8 +1,27 @@
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 CREATE USER 'plug'@'santa.claus.ipv4.example.com'
   IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
 CREATE USER 'plug_dest'@'santa.claus.ipv4.example.com'

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-03-21 10:04:20 +0000
@@ -1,12 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
 select @@global.max_connect_errors;
 @@global.max_connect_errors
 10
+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.%';
+User	Host
+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_connect_errors into @saved_max_connect_errors;
 set global max_connect_errors = 2;
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-03-21 10:04:20 +0000
@@ -1,15 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
 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.%';
+User	Host
+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;
 create user 'quota'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'192.0.2.4';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 create user 'user_without'@'santa.claus.ipv4.example.com';
 create user 'user_with'@'santa.claus.ipv4.example.com'
   identified by 'good_password';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 create user 'user_ssl'@'santa.claus.ipv4.example.com';
 create user 'user_ssl_x509'@'santa.claus.ipv4.example.com'
   identified by 'good_password';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'2001:db8::6:6';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'2001:db8::6:6';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("192.0.2.4");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-03-21 10:04:20 +0000
@@ -1,8 +1,27 @@
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'2001:db8::6:6';
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-03-21 10:04:20 +0000
@@ -1,8 +1,27 @@
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 CREATE USER 'plug'@'santa.claus.ipv6.example.com'
   IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
 CREATE USER 'plug_dest'@'santa.claus.ipv6.example.com'

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-03-21 10:04:20 +0000
@@ -1,12 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
 select @@global.max_connect_errors;
 @@global.max_connect_errors
 10
+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.%';
+User	Host
+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_connect_errors into @saved_max_connect_errors;
 set global max_connect_errors = 2;
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-03-21 10:04:20 +0000
@@ -1,15 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
 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.%';
+User	Host
+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;
 create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("2001:db8::6:6");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("2001:db8::6:6");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("2001:db8::6:6");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 grant select on test.* to 'root'@'2001:db8::6:6';
 select "Con1 is alive";
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,28 @@
 call mtr.add_suppression("2001:db8::6:6");
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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 "Con1 is alive";
 Con1 is alive
 Con1 is alive

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 create user 'user_without'@'santa.claus.ipv6.example.com';
 create user 'user_with'@'santa.claus.ipv6.example.com'
   identified by 'good_password';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result	2012-03-21 10:04:20 +0000
@@ -1,9 +1,27 @@
 flush status;
 flush hosts;
 flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 create user 'user_ssl'@'santa.claus.ipv6.example.com';
 create user 'user_ssl_x509'@'santa.claus.ipv6.example.com'
   identified by 'good_password';

=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-03-12 16:51:23 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-03-21 10:04:20 +0000
@@ -1,8 +1,27 @@
 flush status;
 flush hosts;
+flush user_resources;
+flush privileges;
 select @@global.debug;
 @@global.debug
 
+select @@global.max_connect_errors;
+@@global.max_connect_errors
+10
+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.%';
+User	Host
+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
 show global status like "connection_errors_%";
 Variable_name	Value
 Connection_errors_accept	0

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'192.0.2.4';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test	2012-03-21 10:04:20 +0000
@@ -16,9 +16,9 @@
 # [Note]  - 192.0.2.127
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'192.0.2.4';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test	2012-03-21 10:04:20 +0000
@@ -16,9 +16,9 @@
 # [Note]  - 192.0.2.127
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # no reverse address mapping.
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # no reverse address mapping.
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # Name or service not known
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'192.0.2.4';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # Name or service not known
 call mtr.add_suppression("santa.claus.ipv4.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test	2012-03-21 10:04:20 +0000
@@ -13,9 +13,9 @@
 --source include/have_perfschema.inc
 --source include/have_plugin_auth.inc
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 CREATE USER 'plug'@'santa.claus.ipv4.example.com'
   IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test	2012-03-21 10:04:20 +0000
@@ -12,11 +12,10 @@
 --source include/have_debug.inc
 --source include/have_perfschema.inc
 
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
-select @@global.max_connect_errors;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
+
 select @@global.max_connect_errors into @saved_max_connect_errors;
 
 set global max_connect_errors = 2;

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_format.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_format.test	2012-03-21 10:04:20 +0000
@@ -13,9 +13,9 @@
 # Name or service not known
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test	2012-03-01 10:44:16 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test	2012-03-21 10:04:20 +0000
@@ -14,13 +14,8 @@
 
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
-select @@global.max_user_connections;
-select @@global.max_connections;
 select @@global.max_connections into @saved_max_connections;
 
 create user 'quota'@'santa.claus.ipv4.example.com';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # no reverse address mapping.
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'192.0.2.4';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 # no reverse address mapping.
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test	2012-02-15 12:05:06 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test	2012-03-21 10:04:20 +0000
@@ -12,10 +12,9 @@
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
 
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 create user 'user_without'@'santa.claus.ipv4.example.com';
 create user 'user_with'@'santa.claus.ipv4.example.com'

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test	2012-02-15 12:05:06 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test	2012-03-21 10:04:20 +0000
@@ -11,11 +11,7 @@
 
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
-
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
+--source ../include/hostcache_set_state.inc
 
 create user 'user_ssl'@'santa.claus.ipv4.example.com';
 create user 'user_ssl_x509'@'santa.claus.ipv4.example.com'

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'2001:db8::6:6';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"::1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test	2012-03-21 10:04:20 +0000
@@ -17,9 +17,9 @@
 # [Note]  - 2001:db8::6:7f
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'2001:db8::6:6';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test	2012-03-21 10:04:20 +0000
@@ -17,10 +17,9 @@
 # [Note]  - 2001:db8::6:7f
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"::1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # no reverse address mapping.
 call mtr.add_suppression("192.0.2.4");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test	2012-03-21 10:04:20 +0000
@@ -11,9 +11,9 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"::1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Name or service not known
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'2001:db8::6:6';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Name or service not known
 call mtr.add_suppression("santa.claus.ipv6.example.com");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"::1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test	2012-03-21 10:04:20 +0000
@@ -14,9 +14,9 @@
 --source include/have_perfschema.inc
 --source include/have_plugin_auth.inc
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 CREATE USER 'plug'@'santa.claus.ipv6.example.com'
   IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test	2012-03-21 10:04:20 +0000
@@ -13,11 +13,10 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
-select @@global.max_connect_errors;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
+
 select @@global.max_connect_errors into @saved_max_connect_errors;
 
 set global max_connect_errors = 2;

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test	2012-03-01 10:44:16 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test	2012-03-21 10:04:20 +0000
@@ -15,13 +15,8 @@
 
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
-select @@global.max_user_connections;
-select @@global.max_connections;
 select @@global.max_connections into @saved_max_connections;
 
 create user 'quota'@'santa.claus.ipv6.example.com';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("2001:db8::6:6");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Temporary failure in name resolution
 call mtr.add_suppression("2001:db8::6:6");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"::1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Name or service not known
 call mtr.add_suppression("2001:db8::6:6");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 grant select on test.* to 'root'@'2001:db8::6:6';
 

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test	2012-03-21 10:04:20 +0000
@@ -15,9 +15,9 @@
 # Name or service not known
 call mtr.add_suppression("2001:db8::6:6");
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
 
 connect (con1,"::1",root,,test,$MASTER_MYPORT,);
 select "Con1 is alive";

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test	2012-02-16 10:47:43 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test	2012-03-21 10:04:20 +0000
@@ -12,11 +12,7 @@
 
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
-
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
+--source ../include/hostcache_set_state.inc
 
 create user 'user_without'@'santa.claus.ipv6.example.com';
 create user 'user_with'@'santa.claus.ipv6.example.com'

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test	2012-02-16 10:47:43 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test	2012-03-21 10:04:20 +0000
@@ -12,11 +12,7 @@
 
 # Enforce a clean state
 --source ../include/wait_for_pfs_thread_count.inc
-
-flush status;
-flush hosts;
-flush user_resources;
-select @@global.debug;
+--source ../include/hostcache_set_state.inc
 
 create user 'user_ssl'@'santa.claus.ipv6.example.com';
 create user 'user_ssl_x509'@'santa.claus.ipv6.example.com'

=== modified file 'mysql-test/suite/perfschema/t/hostcache_peer_addr.test'
--- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test	2012-02-08 15:55:31 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test	2012-03-21 10:04:20 +0000
@@ -9,9 +9,10 @@
 --source include/have_debug.inc
 --source include/have_perfschema.inc
 
-flush status;
-flush hosts;
-select @@global.debug;
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+--source ../include/hostcache_set_state.inc
+
 show global status like "connection_errors_%";
 
 connect (con1,"127.0.0.1",root,,test,$MASTER_MYPORT,);

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marc.alff:3810 to 3811) Bug#13812227Marc Alff21 Mar