List:Commits« Previous MessageNext Message »
From:Marc Alff Date:February 20 2012 11:12am
Subject:bzr push into mysql-trunk-wl5259 branch (marc.alff:3384 to 3385)
View as plain text  
 3385 Marc Alff	2012-02-20
      Simplified test output

    modified:
      mysql-test/suite/perfschema/include/hostcache_dump.inc
      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
 3384 Marc Alff	2012-02-16
      Test cleanup

    modified:
      mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
=== modified file 'mysql-test/suite/perfschema/include/hostcache_dump.inc'
--- a/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-02-20 11:11:30 +0000
@@ -1,5 +1,8 @@
 # Helper for hostcache_*.test
 
+--echo "Dumping performance_schema.host_cache"
+
+--disable_query_log
 --vertical_results
 select 
   IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
@@ -24,8 +27,13 @@ select 
   COUNT_INIT_CONNECT_ERRORS,
   COUNT_LOCAL_ERRORS,
   COUNT_UNKNOWN_ERRORS,
-  if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-  if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
+  if (FIRST_ERROR_SEEN is not null,
+     if (FIRST_ERROR_SEEN > date("2012-01-01"), "set", "wrong epoch"),
+     "null") as FIRST_ERROR_SEEN,
+  if (LAST_ERROR_SEEN is not null,
+     if (FIRST_ERROR_SEEN > date("2012-01-01"), "set", "wrong epoch"),
+     "null") as LAST_ERROR_SEEN
   from performance_schema.host_cache;
 --horizontal_results
+--enable_query_log
 

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-02-20 11:11:30 +0000
@@ -19,32 +19,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -78,32 +53,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-02-07 14:35:13 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-02-20 11:11:30 +0000
@@ -17,32 +17,7 @@ root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -71,32 +46,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -126,32 +76,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 install plugin test_plugin_server soname 'PLUGIN_AUTH';
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -180,32 +105,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -244,32 +144,7 @@ plug@stripped
 select current_user();
 current_user()
 plug_dest@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-07 14:35:13 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -72,32 +47,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -126,32 +76,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -180,32 +105,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -234,32 +134,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -289,32 +164,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 flush hosts;
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-02-20 11:11:30 +0000
@@ -28,32 +28,7 @@ Con2a is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -87,32 +62,7 @@ Con2b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -146,32 +96,7 @@ Con2c is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -200,32 +125,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -254,32 +154,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -318,32 +193,7 @@ Con7 is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -377,32 +227,7 @@ Con3b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -436,32 +261,7 @@ Con3c is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -490,32 +290,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -544,32 +319,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -607,32 +357,7 @@ Con4a is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -666,32 +391,7 @@ Con4b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -725,32 +425,7 @@ Con4c is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -779,32 +454,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -833,32 +483,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -895,32 +520,7 @@ Con4a is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -954,32 +554,7 @@ Con5b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -1008,32 +583,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08004: Too many connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -1062,32 +612,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08004: Too many connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-02-20 11:11:30 +0000
@@ -19,32 +19,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -78,32 +53,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -138,32 +88,7 @@ Con4 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -197,32 +122,7 @@ Con5 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -121,32 +71,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -175,32 +100,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result	2012-02-15 12:05:06 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result	2012-02-20 11:11:30 +0000
@@ -17,32 +17,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -71,32 +46,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -125,32 +75,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -179,32 +104,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -233,32 +133,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -287,32 +162,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result	2012-02-15 12:05:06 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result	2012-02-20 11:11:30 +0000
@@ -21,32 +21,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -75,32 +50,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -129,32 +79,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -183,32 +108,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv4.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-02-20 11:11:30 +0000
@@ -11,32 +11,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -65,32 +40,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-02-20 11:11:30 +0000
@@ -19,32 +19,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -78,32 +53,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-02-07 14:35:13 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-02-20 11:11:30 +0000
@@ -17,32 +17,7 @@ root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -71,32 +46,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -126,32 +76,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 install plugin test_plugin_server soname 'PLUGIN_AUTH';
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -180,32 +105,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -244,32 +144,7 @@ plug@stripped
 select current_user();
 current_user()
 plug_dest@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-07 14:35:13 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -72,32 +47,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -126,32 +76,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -180,32 +105,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -234,32 +134,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -289,32 +164,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 flush hosts;
 ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-02-20 11:11:30 +0000
@@ -28,32 +28,7 @@ Con2a is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -87,32 +62,7 @@ Con2b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -146,32 +96,7 @@ Con2c is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -200,32 +125,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -254,32 +154,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -318,32 +193,7 @@ Con7 is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -377,32 +227,7 @@ Con3b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -436,32 +261,7 @@ Con3c is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -490,32 +290,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -544,32 +319,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -607,32 +357,7 @@ Con4a is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -666,32 +391,7 @@ Con4b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -725,32 +425,7 @@ Con4c is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -779,32 +454,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -833,32 +483,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -895,32 +520,7 @@ Con4a is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -954,32 +554,7 @@ Con5b is alive
 select current_user();
 current_user()
 quota@stripped
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -1008,32 +583,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08004: Too many connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -1062,32 +612,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08004: Too many connections
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-02-20 11:11:30 +0000
@@ -19,32 +19,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -78,32 +53,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -138,32 +88,7 @@ Con4 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -197,32 +122,7 @@ Con5 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -121,32 +71,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -175,32 +100,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-02-20 11:11:30 +0000
@@ -18,32 +18,7 @@ Con2 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -77,32 +52,7 @@ Con3 is alive
 select current_user();
 current_user()
 root@2001:db8::6:6
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

=== 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-02-06 09:49:52 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-02-20 11:11:30 +0000
@@ -12,32 +12,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -66,32 +41,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result	2012-02-15 12:05:06 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result	2012-02-20 11:11:30 +0000
@@ -17,32 +17,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -71,32 +46,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -125,32 +75,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -179,32 +104,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -233,32 +133,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -287,32 +162,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result	2012-02-15 12:05:06 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result	2012-02-20 11:11:30 +0000
@@ -21,32 +21,7 @@ current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -75,32 +50,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -129,32 +79,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -183,32 +108,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv6.example.com' (using password: YES)
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-08 15:55:31 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-20 11:11:30 +0000
@@ -27,32 +27,7 @@ Connection_errors_max_connection	0
 Connection_errors_peer_address	1
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 ERROR HY000: Can't get hostname for your address
 show global status like "connection_errors_%";
 Variable_name	Value
@@ -62,32 +37,7 @@ Connection_errors_max_connection	0
 Connection_errors_peer_address	2
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
-select 
-IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
-COUNT_HOST_BLOCKED_ERRORS,
-COUNT_NAMEINFO_TRANSIENT_ERRORS,
-COUNT_NAMEINFO_PERMANENT_ERRORS,
-COUNT_FORMAT_ERRORS,
-COUNT_ADDRINFO_TRANSIENT_ERRORS,
-COUNT_ADDRINFO_PERMANENT_ERRORS,
-COUNT_FCRDNS_ERRORS,
-COUNT_HOST_ACL_ERRORS,
-COUNT_NO_AUTH_PLUGIN_ERRORS,
-COUNT_AUTH_PLUGIN_ERRORS,
-COUNT_HANDSHAKE_ERRORS,
-COUNT_PROXY_USER_ERRORS,
-COUNT_PROXY_USER_ACL_ERRORS,
-COUNT_AUTHENTICATION_ERRORS,
-COUNT_SSL_ERRORS,
-COUNT_MAX_USER_CONNECTION_ERRORS,
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_DEFAULT_DATABASE_ERRORS,
-COUNT_INIT_CONNECT_ERRORS,
-COUNT_LOCAL_ERRORS,
-COUNT_UNKNOWN_ERRORS,
-if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
-if (LAST_ERROR_SEEN is not null, "set", "null") as LAST_ERROR_SEEN
-from performance_schema.host_cache;
+"Dumping performance_schema.host_cache"
 set global debug= default;
 flush status;
 show global status like "connection_errors_%";

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5259 branch (marc.alff:3384 to 3385) Marc Alff20 Feb