List:Commits« Previous MessageNext Message »
From:Marc Alff Date:January 26 2012 10:11am
Subject:bzr push into mysql-trunk-wl5259 branch (marc.alff:3359 to 3360)
View as plain text  
 3360 Marc Alff	2012-01-26
      Work in progress

    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_format.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_no_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.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_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_peer_addr.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/table_schema.result
      scripts/mysql_system_tables.sql
      sql/hostname.cc
      sql/hostname.h
      sql/sql_acl.cc
      sql/sql_connect.cc
      storage/perfschema/table_host_cache.cc
      storage/perfschema/table_host_cache.h
 3359 Marc Alff	2012-01-24
      Work in progress

    added:
      mysql-test/suite/perfschema/r/hostcache_ipv4_no_auth_plugin.result
      mysql-test/suite/perfschema/t/hostcache_ipv4_no_auth_plugin-master.opt
      mysql-test/suite/perfschema/t/hostcache_ipv4_no_auth_plugin.test
    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_format.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_ipv6_addrinfo_again_deny.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_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_peer_addr.result
      scripts/mysql_system_tables.sql
      sql/hostname.cc
      sql/hostname.h
      sql/sql_acl.cc
      sql/sql_connect.cc
      storage/perfschema/table_host_cache.cc
      storage/perfschema/table_host_cache.h
=== modified file 'mysql-test/suite/perfschema/include/hostcache_dump.inc'
--- a/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-01-26 10:10:55 +0000
@@ -15,9 +15,13 @@ select
   COUNT_NO_AUTH_PLUGIN_ERRORS,
   COUNT_AUTH_PLUGIN_ERRORS,
   COUNT_HANDSHAKE_ERRORS,
-  COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
   COUNT_USER_ACL_ERRORS,
   COUNT_LOCAL_ERRORS,
   COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-01-26 10:10:55 +0000
@@ -32,9 +32,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -56,9 +60,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -81,9 +89,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -105,9 +117,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-01-26 10:10:55 +0000
@@ -37,9 +37,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -61,9 +65,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -91,9 +99,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -115,9 +127,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-01-26 10:10:55 +0000
@@ -37,9 +37,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -61,9 +65,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -91,9 +99,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -115,9 +127,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-01-26 10:10:55 +0000
@@ -38,9 +38,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -62,9 +66,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -92,9 +100,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -116,9 +128,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-01-26 10:10:55 +0000
@@ -38,9 +38,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -62,9 +66,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -92,9 +100,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -116,9 +128,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -147,9 +163,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -171,9 +191,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -201,9 +225,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -225,9 +253,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -130,9 +146,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -154,9 +174,13 @@ COUNT_HOST_ACL_ERRORS	3
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -179,9 +203,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -203,9 +231,13 @@ COUNT_HOST_ACL_ERRORS	4
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-01-26 10:10:55 +0000
@@ -37,9 +37,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -61,9 +65,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -91,9 +99,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -115,9 +127,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_no_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_no_auth_plugin.result	2012-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_no_auth_plugin.result	2012-01-26 10:10:55 +0000
@@ -37,9 +37,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -61,9 +65,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	1
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -86,9 +94,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -110,9 +122,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	2
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -136,9 +152,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -160,9 +180,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	2
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 COUNT_PROXY_USER_ERRORS	1
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -185,9 +209,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -209,9 +237,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	2
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 COUNT_PROXY_USER_ERRORS	2
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -244,9 +276,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -268,9 +304,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	2
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 COUNT_PROXY_USER_ERRORS	2
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-01-26 10:10:55 +0000
@@ -37,9 +37,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -61,9 +65,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -91,9 +99,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -115,9 +127,13 @@ COUNT_HOST_ACL_ERRORS	0
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-01-26 10:10:55 +0000
@@ -30,9 +30,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -54,9 +58,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -79,9 +87,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -103,9 +115,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -130,9 +146,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -154,9 +174,13 @@ COUNT_HOST_ACL_ERRORS	3
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -179,9 +203,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -203,9 +231,13 @@ COUNT_HOST_ACL_ERRORS	4
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_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-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-01-26 10:10:55 +0000
@@ -31,9 +31,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -55,9 +59,13 @@ COUNT_HOST_ACL_ERRORS	1
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
@@ -80,9 +88,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -104,9 +116,13 @@ COUNT_HOST_ACL_ERRORS	2
 COUNT_NO_AUTH_PLUGIN_ERRORS	0
 COUNT_AUTH_PLUGIN_ERRORS	0
 COUNT_HANDSHAKE_ERRORS	0
-COUNT_AUTHENTICATION_ERRORS	0
 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_CONNECTION_ERRORS	0
 COUNT_USER_ACL_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-01-24 11:36:34 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-01-26 10:10:55 +0000
@@ -30,9 +30,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
@@ -56,9 +60,13 @@ COUNT_HOST_ACL_ERRORS,
 COUNT_NO_AUTH_PLUGIN_ERRORS,
 COUNT_AUTH_PLUGIN_ERRORS,
 COUNT_HANDSHAKE_ERRORS,
-COUNT_AUTHENTICATION_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_MAX_CONNECTION_ERRORS,
 COUNT_USER_ACL_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2012-01-23 15:45:22 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2012-01-26 10:10:55 +0000
@@ -26,40 +26,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 420: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 429: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 443: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 453: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 463: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 472: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 500: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 508: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 553: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 597: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 696: Table 'threads' already exists
-ERROR 1050 (42S01) at line 712: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 728: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 744: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 757: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 770: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 783: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 797: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 853: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 897: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 941: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 973: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1005: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1037: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1070: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1101: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1119: Table 'users' already exists
-ERROR 1050 (42S01) at line 1129: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1549: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -90,40 +90,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 420: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 429: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 443: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 453: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 463: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 472: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 500: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 508: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 553: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 597: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 696: Table 'threads' already exists
-ERROR 1050 (42S01) at line 712: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 728: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 744: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 757: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 770: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 783: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 797: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 853: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 897: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 941: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 973: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1005: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1037: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1070: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1101: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1119: Table 'users' already exists
-ERROR 1050 (42S01) at line 1129: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1549: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -152,40 +152,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 420: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 429: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 443: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 453: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 463: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 472: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 500: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 508: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 553: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 597: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 696: Table 'threads' already exists
-ERROR 1050 (42S01) at line 712: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 728: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 744: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 757: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 770: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 783: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 797: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 853: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 897: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 941: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 973: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1005: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1037: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1070: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1101: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1119: Table 'users' already exists
-ERROR 1050 (42S01) at line 1129: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1549: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -214,40 +214,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 420: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 429: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 443: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 453: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 463: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 472: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 500: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 508: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 553: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 597: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 696: Table 'threads' already exists
-ERROR 1050 (42S01) at line 712: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 728: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 744: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 757: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 770: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 783: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 797: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 853: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 897: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 941: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 973: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1005: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1037: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1070: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1101: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1119: Table 'users' already exists
-ERROR 1050 (42S01) at line 1129: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1549: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -276,40 +276,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 420: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 429: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 443: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 453: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 463: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 472: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 500: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 508: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 553: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 597: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 696: Table 'threads' already exists
-ERROR 1050 (42S01) at line 712: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 728: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 744: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 757: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 770: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 783: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 797: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 853: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 897: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 941: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 973: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1005: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1037: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1070: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1101: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1119: Table 'users' already exists
-ERROR 1050 (42S01) at line 1129: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1549: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 705: Table 'threads' already exists
+ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1128: Table 'users' already exists
+ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2012-01-23 15:45:22 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2012-01-26 10:10:55 +0000
@@ -647,7 +647,8 @@ host_cache	CREATE TABLE `host_cache` (
   `IP` varchar(64) NOT NULL,
   `HOST` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `HOST_VALIDATED` enum('YES','NO') NOT NULL,
-  `SUM_BLOCKING_ERRORS` bigint(20) NOT NULL,
+  `SUM_CONNECT_ERRORS` bigint(20) NOT NULL,
+  `COUNT_HOST_BLOCKED_ERRORS` bigint(20) NOT NULL,
   `COUNT_NAMEINFO_TRANSIENT_ERRORS` bigint(20) NOT NULL,
   `COUNT_NAMEINFO_PERMANENT_ERRORS` bigint(20) NOT NULL,
   `COUNT_FORMAT_ERRORS` bigint(20) NOT NULL,
@@ -655,8 +656,16 @@ host_cache	CREATE TABLE `host_cache` (
   `COUNT_ADDRINFO_PERMANENT_ERRORS` bigint(20) NOT NULL,
   `COUNT_FCRDNS_ERRORS` bigint(20) NOT NULL,
   `COUNT_HOST_ACL_ERRORS` bigint(20) NOT NULL,
+  `COUNT_NO_AUTH_PLUGIN_ERRORS` bigint(20) NOT NULL,
+  `COUNT_AUTH_PLUGIN_ERRORS` bigint(20) NOT NULL,
   `COUNT_HANDSHAKE_ERRORS` bigint(20) NOT NULL,
+  `COUNT_PROXY_USER_ERRORS` bigint(20) NOT NULL,
+  `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_CONNECTION_ERRORS` bigint(20) NOT NULL,
   `COUNT_USER_ACL_ERRORS` bigint(20) NOT NULL,
   `COUNT_LOCAL_ERRORS` bigint(20) NOT NULL,
   `COUNT_UNKNOWN_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-01-23 15:45:22 +0000
+++ b/mysql-test/suite/perfschema/r/table_schema.result	2012-01-26 10:10:55 +0000
@@ -472,23 +472,32 @@ def	performance_schema	hosts	TOTAL_CONNE
 def	performance_schema	host_cache	IP	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 def	performance_schema	host_cache	HOST	2	NULL	YES	varchar	255	765	NULL	NULL	NULL	utf8	utf8_bin	varchar(255)			select,insert,update,references	
 def	performance_schema	host_cache	HOST_VALIDATED	3	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
-def	performance_schema	host_cache	SUM_BLOCKING_ERRORS	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_NAMEINFO_TRANSIENT_ERRORS	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_NAMEINFO_PERMANENT_ERRORS	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_FORMAT_ERRORS	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_ADDRINFO_TRANSIENT_ERRORS	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_ADDRINFO_PERMANENT_ERRORS	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_FCRDNS_ERRORS	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_HOST_ACL_ERRORS	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_HANDSHAKE_ERRORS	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_AUTHENTICATION_ERRORS	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_USER_ACL_ERRORS	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_LOCAL_ERRORS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_UNKNOWN_ERRORS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	FIRST_SEEN	17	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
-def	performance_schema	host_cache	LAST_SEEN	18	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
-def	performance_schema	host_cache	FIRST_ERROR_SEEN	19	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
-def	performance_schema	host_cache	LAST_ERROR_SEEN	20	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	SUM_CONNECT_ERRORS	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_HOST_BLOCKED_ERRORS	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_NAMEINFO_TRANSIENT_ERRORS	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_NAMEINFO_PERMANENT_ERRORS	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_FORMAT_ERRORS	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_ADDRINFO_TRANSIENT_ERRORS	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_ADDRINFO_PERMANENT_ERRORS	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_FCRDNS_ERRORS	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_HOST_ACL_ERRORS	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_NO_AUTH_PLUGIN_ERRORS	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_AUTH_PLUGIN_ERRORS	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_HANDSHAKE_ERRORS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_PROXY_USER_ERRORS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+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_CONNECTION_ERRORS	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_USER_ACL_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	
+def	performance_schema	host_cache	COUNT_UNKNOWN_ERRORS	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	FIRST_SEEN	26	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	LAST_SEEN	27	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	FIRST_ERROR_SEEN	28	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	LAST_ERROR_SEEN	29	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
 def	performance_schema	mutex_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
 def	performance_schema	mutex_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
 def	performance_schema	mutex_instances	LOCKED_BY_THREAD_ID	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references	

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2012-01-24 11:36:34 +0000
+++ b/scripts/mysql_system_tables.sql	2012-01-26 10:10:55 +0000
@@ -626,6 +626,10 @@ SET @cmd="CREATE TABLE performance_schem
   "COUNT_PROXY_USER_ERRORS BIGINT not null,"
   "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_CONNECTION_ERRORS BIGINT not null,"
   "COUNT_USER_ACL_ERRORS BIGINT not null,"
   "COUNT_LOCAL_ERRORS BIGINT not null,"
   "COUNT_UNKNOWN_ERRORS BIGINT not null,"

=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2012-01-24 11:36:34 +0000
+++ b/sql/hostname.cc	2012-01-26 10:10:55 +0000
@@ -62,6 +62,10 @@ Host_errors::Host_errors()
   m_proxy_user(0),
   m_proxy_user_acl(0),
   m_authentication(0),
+  m_ssl(0),
+  m_max_user_connection(0),
+  m_max_user_connection_per_hour(0),
+  m_max_connection(0),
   m_user_acl(0),
   m_local(0),
   m_unknown(0)
@@ -87,6 +91,10 @@ void Host_errors::reset()
   m_proxy_user= 0;
   m_proxy_user_acl= 0;
   m_authentication= 0;
+  m_ssl= 0;
+  m_max_user_connection= 0;
+  m_max_user_connection_per_hour= 0;
+  m_max_connection= 0;
   m_user_acl= 0;
   m_local= 0;
   m_unknown= 0;
@@ -109,6 +117,10 @@ void Host_errors::aggregate(const Host_e
   m_proxy_user+= errors->m_proxy_user;
   m_proxy_user_acl+= errors->m_proxy_user_acl;
   m_authentication+= errors->m_authentication;
+  m_ssl+= errors->m_ssl;
+  m_max_user_connection+= errors->m_max_user_connection;
+  m_max_user_connection_per_hour+= errors->m_max_user_connection_per_hour;
+  m_max_connection+= errors->m_max_connection;
   m_user_acl+= errors->m_user_acl;
   m_local+= errors->m_local;
   m_unknown+= errors->m_unknown;

=== modified file 'sql/hostname.h'
--- a/sql/hostname.h	2012-01-24 11:36:34 +0000
+++ b/sql/hostname.h	2012-01-26 10:10:55 +0000
@@ -63,6 +63,14 @@ public:
   ulong m_proxy_user_acl;
   /** Number of errors from authentication. */
   ulong m_authentication;
+  /** Number of errors from ssl. */
+  ulong m_ssl;
+  /** Number of errors from max user connection. */
+  ulong m_max_user_connection;
+  /** Number of errors from max user connection per hour. */
+  ulong m_max_user_connection_per_hour;
+  /** Number of errors from max connection. */
+  ulong m_max_connection;
   /** Number of errors from user grants. */
   ulong m_user_acl;
   /** Number of errors from the server itself. */
@@ -86,6 +94,10 @@ public:
       || (m_proxy_user != 0)
       || (m_proxy_user_acl != 0)
       || (m_authentication != 0)
+      || (m_ssl != 0)
+      || (m_max_user_connection != 0)
+      || (m_max_user_connection_per_hour != 0)
+      || (m_max_connection != 0)
       || (m_user_acl != 0)
       || (m_local != 0)
       || (m_unknown != 0));

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2012-01-24 11:36:34 +0000
+++ b/sql/sql_acl.cc	2012-01-26 10:10:55 +0000
@@ -9510,7 +9510,9 @@ acl_authenticate(THD *thd, uint connect_
   if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS)
   {
     DBUG_ASSERT(mpvio.status == MPVIO_EXT::FAILURE);
-
+    Host_errors errors;
+    errors.m_authentication= 1;
+    inc_host_errors(mpvio.ip, &errors);
     if (!thd->is_error())
       login_failed_error(&mpvio, mpvio.auth_info.password_used);
     DBUG_RETURN (1);
@@ -9586,6 +9588,9 @@ acl_authenticate(THD *thd, uint connect_
     */
     if (acl_check_ssl(thd, acl_user))
     {
+      Host_errors errors;
+      errors.m_ssl= 1;
+      inc_host_errors(mpvio.ip, &errors);
       if (!thd->is_error())
         login_failed_error(&mpvio, thd->password);
       DBUG_RETURN(1);
@@ -9633,6 +9638,9 @@ acl_authenticate(THD *thd, uint connect_
     mysql_mutex_unlock(&LOCK_connection_count);
     if (!count_ok)
     {                                         // too many connections
+      Host_errors errors;
+      errors.m_max_connection= 1;
+      inc_host_errors(mpvio.ip, &errors);
       my_error(ER_CON_COUNT_ERROR, MYF(0));
       DBUG_RETURN(1);
     }
@@ -9656,6 +9664,9 @@ acl_authenticate(THD *thd, uint connect_
         decrease_user_connections(thd->user_connect);
         thd->user_connect= 0;
       }
+      Host_errors errors;
+      errors.m_user_acl= 1;
+      inc_host_errors(mpvio.ip, &errors);
       DBUG_RETURN(1);
     }
   }

=== modified file 'sql/sql_connect.cc'
--- a/sql/sql_connect.cc	2012-01-24 11:36:34 +0000
+++ b/sql/sql_connect.cc	2012-01-26 10:10:55 +0000
@@ -136,6 +136,7 @@ end:
 int check_for_max_user_connections(THD *thd, USER_CONN *uc)
 {
   int error=0;
+  Host_errors errors;
   DBUG_ENTER("check_for_max_user_connections");
 
   mysql_mutex_lock(&LOCK_user_conn);
@@ -145,6 +146,7 @@ int check_for_max_user_connections(THD *
   {
     my_error(ER_TOO_MANY_USER_CONNECTIONS, MYF(0), uc->user);
     error=1;
+    errors.m_max_user_connection= 1;
     goto end;
   }
   time_out_user_resource_limits(thd, uc);
@@ -155,6 +157,7 @@ int check_for_max_user_connections(THD *
              "max_user_connections",
              (long) uc->user_resources.user_conn);
     error= 1;
+    errors.m_max_user_connection= 1;
     goto end;
   }
   if (uc->user_resources.conn_per_hour &&
@@ -164,6 +167,7 @@ int check_for_max_user_connections(THD *
              "max_connections_per_hour",
              (long) uc->user_resources.conn_per_hour);
     error=1;
+    errors.m_max_user_connection_per_hour= 1;
     goto end;
   }
   uc->conn_per_hour++;
@@ -180,6 +184,10 @@ end:
     thd->user_connect= NULL;
   }
   mysql_mutex_unlock(&LOCK_user_conn);
+  if (error)
+  {
+    inc_host_errors(thd->main_security_ctx.ip, &errors);
+  }
   DBUG_RETURN(error);
 }
 

=== modified file 'storage/perfschema/table_host_cache.cc'
--- a/storage/perfschema/table_host_cache.cc	2012-01-24 11:36:34 +0000
+++ b/storage/perfschema/table_host_cache.cc	2012-01-26 10:10:55 +0000
@@ -118,6 +118,26 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
+    { C_STRING_WITH_LEN("COUNT_SSL_ERRORS.") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("COUNT_MAX_USER_CONNECTION_ERRORS..") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS..") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("COUNT_MAX_CONNECTION_ERRORS...") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
     { C_STRING_WITH_LEN("COUNT_USER_ACL_ERRORS") },
     { C_STRING_WITH_LEN("bigint(20)") },
     { NULL, 0}
@@ -156,7 +176,7 @@ static const TABLE_FIELD_TYPE field_type
 
 TABLE_FIELD_DEF
 table_host_cache::m_field_def=
-{ 25, field_types };
+{ 29, field_types };
 
 PFS_engine_table_share
 table_host_cache::m_share=
@@ -273,6 +293,10 @@ void table_host_cache::make_row(Host_ent
   row->m_count_proxy_user_errors= entry->m_errors.m_proxy_user;
   row->m_count_proxy_user_acl_errors= entry->m_errors.m_proxy_user_acl;
   row->m_count_authentication_errors= entry->m_errors.m_authentication;
+  row->m_count_ssl_errors= entry->m_errors.m_ssl;
+  row->m_count_max_user_connection_errors= entry->m_errors.m_max_user_connection;
+  row->m_count_max_user_connection_per_hour_errors= entry->m_errors.m_max_user_connection_per_hour;
+  row->m_count_max_connection_errors= entry->m_errors.m_max_connection;
   row->m_count_user_acl_errors= entry->m_errors.m_user_acl;
   row->m_count_local_errors= entry->m_errors.m_local;
   row->m_count_unknown_errors= entry->m_errors.m_unknown;
@@ -393,28 +417,40 @@ int table_host_cache::read_row_values(TA
       case 17: /* COUNT_AUTHENTICATION_ERRORS */
         set_field_ulonglong(f, m_row->m_count_authentication_errors);
         break;
-      case 18: /* COUNT_USER_ACL_ERRORS */
+      case 18: /* COUNT_SSL_ERRORS */
+        set_field_ulonglong(f, m_row->m_count_ssl_errors);
+        break;
+      case 19: /* COUNT_MAX_USER_CONNECTION_ERRORS */
+        set_field_ulonglong(f, m_row->m_count_max_user_connection_errors);
+        break;
+      case 20: /* COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS */
+        set_field_ulonglong(f, m_row->m_count_max_user_connection_per_hour_errors);
+        break;
+      case 21: /* COUNT_MAX_CONNECTION_ERRORS */
+        set_field_ulonglong(f, m_row->m_count_max_connection_errors);
+        break;
+      case 22: /* COUNT_USER_ACL_ERRORS */
         set_field_ulonglong(f, m_row->m_count_user_acl_errors);
         break;
-      case 19: /* COUNT_LOCAL_ERRORS */
+      case 23: /* COUNT_LOCAL_ERRORS */
         set_field_ulonglong(f, m_row->m_count_local_errors);
         break;
-      case 20: /* COUNT_UNKNOWN_ERRORS */
+      case 24: /* COUNT_UNKNOWN_ERRORS */
         set_field_ulonglong(f, m_row->m_count_unknown_errors);
         break;
-      case 21: /* FIRST_SEEN */
+      case 25: /* FIRST_SEEN */
         set_field_timestamp(f, m_row->m_first_seen);
         break;
-      case 22: /* LAST_SEEN */
+      case 26: /* LAST_SEEN */
         set_field_timestamp(f, m_row->m_last_seen);
         break;
-      case 23: /* FIRST_ERROR_SEEN */
+      case 27: /* FIRST_ERROR_SEEN */
         if (m_row->m_first_error_seen != 0)
           set_field_timestamp(f, m_row->m_first_error_seen);
         else
           f->set_null();
         break;
-      case 24: /* LAST_ERROR_SEEN */
+      case 28: /* LAST_ERROR_SEEN */
         if (m_row->m_last_error_seen != 0)
           set_field_timestamp(f, m_row->m_last_error_seen);
         else

=== modified file 'storage/perfschema/table_host_cache.h'
--- a/storage/perfschema/table_host_cache.h	2012-01-24 11:36:34 +0000
+++ b/storage/perfschema/table_host_cache.h	2012-01-26 10:10:55 +0000
@@ -72,6 +72,14 @@ struct row_host_cache
   ulonglong m_count_proxy_user_acl_errors;
   /** Column COUNT_AUTHENTICATION_ERRORS. */
   ulonglong m_count_authentication_errors;
+  /** Column COUNT_SSL_ERRORS. */
+  ulonglong m_count_ssl_errors;
+  /** Column COUNT_MAX_USER_CONNECTION_ERRORS. */
+  ulonglong m_count_max_user_connection_errors;
+  /** Column COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS. */
+  ulonglong m_count_max_user_connection_per_hour_errors;
+  /** Column COUNT_MAX_CONNECTION_ERRORS. */
+  ulonglong m_count_max_connection_errors;
   /** Column COUNT_USER_ACL_ERRORS. */
   ulonglong m_count_user_acl_errors;
   /** Column COUNT_LOCAL_ERRORS. */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5259 branch (marc.alff:3359 to 3360) Marc Alff30 Jan