List:Commits« Previous MessageNext Message »
From:Marc Alff Date:March 12 2012 4:32pm
Subject:bzr push into mysql-trunk branch (marc.alff:3714 to 3715) WL#5259
View as plain text  
 3715 Marc Alff	2012-03-12
      Port merge cleanup for WL#5259 performance schema host cache.
      
      Renamed columns / system variables for consistency with existing names.
      - COUNT_MAX_USER_CONNECTION_ERRORS --> COUNT_MAX_USER_CONNECTIONS_ERRORS
      - COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS --> COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS
      - Connection_errors_max_connection --> Connection_errors_max_connections

    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
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/table_schema.result
      scripts/mysql_system_tables.sql
      sql/mysqld.cc
      storage/perfschema/table_host_cache.cc
 3714 Alfranio Correia	2012-03-12
      BUG#13820370 - RPL_GTID_MODE FAILS IN PB
        
      The test case rpl_gtid_mode.test is doing the following steps to
      check whether the server fails while starting up as supposed to be
      or not:
        
        . starting slave with gtid-mode=ON; 
        . issuing "CHANGE MASTER TO AUTO_POSITION=1"; 
        . shutting down slave; 
        . trying to restart slave with gtid-mode=OFF. 
        
      However, when the slave fails in the startup routine, it tries to
      print out an error message with ER(X) which uses "current_thread". 
      This variable is not defined though as there is no thread causing
      a segmentation fault.
        
      To fix the problem, we replace ER(X) by my_error().

    modified:
      mysql-test/include/assert_command_output.inc
      sql/mysqld.cc
      sql/rpl_mi.cc
=== modified file 'mysql-test/suite/perfschema/include/hostcache_dump.inc'
--- a/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-03-12 16:13:37 +0000
@@ -21,8 +21,8 @@ select
   COUNT_PROXY_USER_ACL_ERRORS,
   COUNT_AUTHENTICATION_ERRORS,
   COUNT_SSL_ERRORS,
-  COUNT_MAX_USER_CONNECTION_ERRORS,
-  COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
+  COUNT_MAX_USER_CONNECTIONS_ERRORS,
+  COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS,
   COUNT_DEFAULT_DATABASE_ERRORS,
   COUNT_INIT_CONNECT_ERRORS,
   COUNT_LOCAL_ERRORS,

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-03-12 16:13:37 +0000
@@ -39,8 +39,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -73,8 +73,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-03-12 16:13:37 +0000
@@ -37,8 +37,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -66,8 +66,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -96,8 +96,8 @@ COUNT_PROXY_USER_ERRORS	1
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -125,8 +125,8 @@ COUNT_PROXY_USER_ERRORS	2
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -164,8 +164,8 @@ COUNT_PROXY_USER_ERRORS	2
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -67,8 +67,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -96,8 +96,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -125,8 +125,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -154,8 +154,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -184,8 +184,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-03-01 10:44:16 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-03-12 16:13:37 +0000
@@ -48,8 +48,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -82,8 +82,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -116,8 +116,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -145,8 +145,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	1
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	1
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -174,8 +174,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -213,8 +213,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -247,8 +247,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -281,8 +281,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -310,8 +310,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	1
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	1
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -339,8 +339,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -377,8 +377,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -411,8 +411,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -445,8 +445,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -474,8 +474,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	3
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	3
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -503,8 +503,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -540,8 +540,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -574,8 +574,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -603,8 +603,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -632,8 +632,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-03-12 16:13:37 +0000
@@ -39,8 +39,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -73,8 +73,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -108,8 +108,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -142,8 +142,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -91,8 +91,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -120,8 +120,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result	2012-03-12 16:13:37 +0000
@@ -37,8 +37,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	1
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -66,8 +66,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	2
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -95,8 +95,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -124,8 +124,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	4
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -153,8 +153,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	5
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -182,8 +182,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	6
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result	2012-03-12 16:13:37 +0000
@@ -41,8 +41,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	1
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -70,8 +70,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	2
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -99,8 +99,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	3
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -128,8 +128,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	4
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-03-12 16:13:37 +0000
@@ -31,8 +31,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -60,8 +60,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-03-12 16:13:37 +0000
@@ -39,8 +39,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -73,8 +73,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-03-12 16:13:37 +0000
@@ -37,8 +37,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -66,8 +66,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -96,8 +96,8 @@ COUNT_PROXY_USER_ERRORS	1
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -125,8 +125,8 @@ COUNT_PROXY_USER_ERRORS	2
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -164,8 +164,8 @@ COUNT_PROXY_USER_ERRORS	2
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -67,8 +67,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -96,8 +96,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -125,8 +125,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -154,8 +154,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -184,8 +184,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-03-01 10:44:16 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-03-12 16:13:37 +0000
@@ -48,8 +48,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -82,8 +82,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -116,8 +116,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -145,8 +145,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	1
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	1
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -174,8 +174,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -213,8 +213,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -247,8 +247,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -281,8 +281,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -310,8 +310,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	1
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	1
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -339,8 +339,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -377,8 +377,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -411,8 +411,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -445,8 +445,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	2
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -474,8 +474,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	3
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	3
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -503,8 +503,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -540,8 +540,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -574,8 +574,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -603,8 +603,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -632,8 +632,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	4
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
+COUNT_MAX_USER_CONNECTIONS_ERRORS	4
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-03-12 16:13:37 +0000
@@ -39,8 +39,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -73,8 +73,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -108,8 +108,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -142,8 +142,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -91,8 +91,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -120,8 +120,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-03-12 16:13:37 +0000
@@ -38,8 +38,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -72,8 +72,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== 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-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-03-12 16:13:37 +0000
@@ -32,8 +32,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -61,8 +61,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result	2012-03-12 16:13:37 +0000
@@ -37,8 +37,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	1
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -66,8 +66,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	2
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -95,8 +95,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -124,8 +124,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	4
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -153,8 +153,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	5
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -182,8 +182,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	6
 COUNT_SSL_ERRORS	0
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result	2012-03-12 16:13:37 +0000
@@ -41,8 +41,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	1
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -70,8 +70,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	2
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -99,8 +99,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	3
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -128,8 +128,8 @@ COUNT_PROXY_USER_ERRORS	0
 COUNT_PROXY_USER_ACL_ERRORS	0
 COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	4
-COUNT_MAX_USER_CONNECTION_ERRORS	0
-COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-20 11:11:30 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-03-12 16:13:37 +0000
@@ -7,7 +7,7 @@ show global status like "connection_erro
 Variable_name	Value
 Connection_errors_accept	0
 Connection_errors_internal	0
-Connection_errors_max_connection	0
+Connection_errors_max_connections	0
 Connection_errors_peer_address	0
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
@@ -23,7 +23,7 @@ show global status like "connection_erro
 Variable_name	Value
 Connection_errors_accept	0
 Connection_errors_internal	0
-Connection_errors_max_connection	0
+Connection_errors_max_connections	0
 Connection_errors_peer_address	1
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
@@ -33,7 +33,7 @@ show global status like "connection_erro
 Variable_name	Value
 Connection_errors_accept	0
 Connection_errors_internal	0
-Connection_errors_max_connection	0
+Connection_errors_max_connections	0
 Connection_errors_peer_address	2
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
@@ -44,7 +44,7 @@ show global status like "connection_erro
 Variable_name	Value
 Connection_errors_accept	0
 Connection_errors_internal	0
-Connection_errors_max_connection	0
+Connection_errors_max_connections	0
 Connection_errors_peer_address	0
 Connection_errors_select	0
 Connection_errors_tcpwrap	0

=== modified file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2012-02-28 14:40:36 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2012-03-12 16:13:37 +0000
@@ -670,8 +670,8 @@ host_cache	CREATE TABLE `host_cache` (
   `COUNT_PROXY_USER_ACL_ERRORS` bigint(20) NOT NULL,
   `COUNT_AUTHENTICATION_ERRORS` bigint(20) NOT NULL,
   `COUNT_SSL_ERRORS` bigint(20) NOT NULL,
-  `COUNT_MAX_USER_CONNECTION_ERRORS` bigint(20) NOT NULL,
-  `COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS` bigint(20) NOT NULL,
+  `COUNT_MAX_USER_CONNECTIONS_ERRORS` bigint(20) NOT NULL,
+  `COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS` bigint(20) NOT NULL,
   `COUNT_DEFAULT_DATABASE_ERRORS` bigint(20) NOT NULL,
   `COUNT_INIT_CONNECT_ERRORS` bigint(20) NOT NULL,
   `COUNT_LOCAL_ERRORS` bigint(20) NOT NULL,

=== modified file 'mysql-test/suite/perfschema/r/table_schema.result'
--- a/mysql-test/suite/perfschema/r/table_schema.result	2012-02-28 14:40:36 +0000
+++ b/mysql-test/suite/perfschema/r/table_schema.result	2012-03-12 16:13:37 +0000
@@ -522,8 +522,8 @@ def	performance_schema	host_cache	COUNT_
 def	performance_schema	host_cache	COUNT_PROXY_USER_ACL_ERRORS	17	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_AUTHENTICATION_ERRORS	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_SSL_ERRORS	19	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTION_ERRORS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTIONS_ERRORS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_DEFAULT_DATABASE_ERRORS	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_INIT_CONNECT_ERRORS	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_LOCAL_ERRORS	24	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2012-02-28 14:40:36 +0000
+++ b/scripts/mysql_system_tables.sql	2012-03-12 16:13:37 +0000
@@ -627,8 +627,8 @@ SET @cmd="CREATE TABLE performance_schem
   "COUNT_PROXY_USER_ACL_ERRORS BIGINT not null,"
   "COUNT_AUTHENTICATION_ERRORS BIGINT not null,"
   "COUNT_SSL_ERRORS BIGINT not null,"
-  "COUNT_MAX_USER_CONNECTION_ERRORS BIGINT not null,"
-  "COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS BIGINT not null,"
+  "COUNT_MAX_USER_CONNECTIONS_ERRORS BIGINT not null,"
+  "COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS BIGINT not null,"
   "COUNT_DEFAULT_DATABASE_ERRORS BIGINT not null,"
   "COUNT_INIT_CONNECT_ERRORS BIGINT not null,"
   "COUNT_LOCAL_ERRORS BIGINT not null,"

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-03-12 12:09:40 +0000
+++ b/sql/mysqld.cc	2012-03-12 16:13:37 +0000
@@ -7176,7 +7176,7 @@ SHOW_VAR status_vars[]= {
   {"Connections",              (char*) &thread_id,              SHOW_LONG_NOFLUSH},
   {"Connection_errors_accept", (char*) &connection_errors_accept, SHOW_LONG},
   {"Connection_errors_internal", (char*) &connection_errors_internal, SHOW_LONG},
-  {"Connection_errors_max_connection", (char*) &connection_errors_max_connection, SHOW_LONG},
+  {"Connection_errors_max_connections", (char*) &connection_errors_max_connection, SHOW_LONG},
   {"Connection_errors_peer_address", (char*) &connection_errors_peer_addr, SHOW_LONG},
   {"Connection_errors_select", (char*) &connection_errors_select, SHOW_LONG},
   {"Connection_errors_tcpwrap", (char*) &connection_errors_tcpwrap, SHOW_LONG},

=== modified file 'storage/perfschema/table_host_cache.cc'
--- a/storage/perfschema/table_host_cache.cc	2012-02-20 21:10:16 +0000
+++ b/storage/perfschema/table_host_cache.cc	2012-03-12 16:13:37 +0000
@@ -123,12 +123,12 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
-    { C_STRING_WITH_LEN("COUNT_MAX_USER_CONNECTION_ERRORS") },
+    { C_STRING_WITH_LEN("COUNT_MAX_USER_CONNECTIONS_ERRORS") },
     { C_STRING_WITH_LEN("bigint(20)") },
     { NULL, 0}
   },
   {
-    { C_STRING_WITH_LEN("COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS") },
+    { C_STRING_WITH_LEN("COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS") },
     { C_STRING_WITH_LEN("bigint(20)") },
     { NULL, 0}
   },

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marc.alff:3714 to 3715) WL#5259Marc Alff12 Mar