List:Commits« Previous MessageNext Message »
From:Marc Alff Date:February 6 2012 9:50am
Subject:bzr push into mysql-trunk-wl5259 branch (marc.alff:3372 to 3373)
View as plain text  
 3373 Marc Alff	2012-02-06 [merge]
      Merge mysql-trunk --> mysql-trunk-wl5259, test cleanup

    modified:
      mysql-test/collections/default.experimental
      mysql-test/include/have_32bit.inc
      mysql-test/suite/perfschema/include/hostcache_dump.inc
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_peer_addr.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/rpl_change_master.test
      sql/sql_yacc.yy
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
 3372 Marc Alff	2012-02-06
      Misc cleanup

    modified:
      mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
      mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
      mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
      mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
      scripts/mysql_system_tables.sql
      sql/hostname.cc
      sql/hostname.h
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sql_connect.cc
      storage/perfschema/table_host_cache.cc
      storage/perfschema/table_host_cache.h
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-02-01 08:59:14 +0000
+++ b/mysql-test/collections/default.experimental	2012-02-03 15:16:35 +0000
@@ -9,46 +9,47 @@ main.func_math @freebsd
 main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.signal_demo3 @solaris               # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-main.subquery_sj_all_bka_nixbnl @solaris
-main.subquery_sj_all_bka @solaris
-main.subquery_sj_all_bkaunique @solaris
-main.subquery_sj_all @solaris
-main.subquery_sj_dupsweed_bka_nixbnl @solaris
-main.subquery_sj_dupsweed_bka @solaris
-main.subquery_sj_dupsweed_bkaunique @solaris
-main.subquery_sj_dupsweed @solaris
-main.subquery_sj_firstmatch_bka_nixbnl @solaris
-main.subquery_sj_firstmatch_bka @solaris
-main.subquery_sj_firstmatch_bkaunique @solaris
-main.subquery_sj_firstmatch @solaris
-main.subquery_sj_innodb_all_bka_nixbnl @solaris
-main.subquery_sj_innodb_all_bka @solaris
-main.subquery_sj_innodb_all_bkaunique @solaris
-main.subquery_sj_innodb_all @solaris
-main.subquery_sj_innodb_none_bka_nixbnl @solaris
-main.subquery_sj_innodb_none_bka @solaris
-main.subquery_sj_innodb_none_bkaunique @solaris
-main.subquery_sj_innodb_none @solaris
-main.subquery_sj_loosescan_bka_nixbnl @solaris
-main.subquery_sj_loosescan_bka @solaris
-main.subquery_sj_loosescan_bkaunique @solaris
-main.subquery_sj_loosescan @solaris
-main.subquery_sj_mat_bka_nixbnl @solaris
-main.subquery_sj_mat_bka @solaris
-main.subquery_sj_mat_bkaunique @solaris
-main.subquery_sj_mat_nosj @solaris
-main.subquery_sj_mat @solaris
-main.subquery_sj_none_bka_nixbnl @solaris
-main.subquery_sj_none_bka @solaris
-main.subquery_sj_none_bkaunique @solaris
-main.subquery_sj_none @solaris
+
+main.subquery_sj_all_bka_nixbnl @solaris         # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_all_bka @solaris                # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_all_bkaunique @solaris          # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_all @solaris                    # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_dupsweed_bka_nixbnl @solaris    # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_dupsweed_bka @solaris           # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_dupsweed_bkaunique @solaris     # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_dupsweed @solaris               # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_firstmatch_bka_nixbnl @solaris  # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_firstmatch_bka @solaris         # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_firstmatch_bkaunique @solaris   # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_firstmatch @solaris             # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_all_bka_nixbnl @solaris  # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_all_bka @solaris         # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_all_bkaunique @solaris   # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_all @solaris             # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_none_bka_nixbnl @solaris # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_none_bka @solaris        # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_none_bkaunique @solaris  # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_innodb_none @solaris            # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_loosescan_bka_nixbnl @solaris   # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_loosescan_bka @solaris          # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_loosescan_bkaunique @solaris    # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_loosescan @solaris              # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_mat_bka_nixbnl @solaris         # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_mat_bka @solaris                # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_mat_bkaunique @solaris          # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_mat_nosj @solaris               # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_mat @solaris                    # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_none_bka_nixbnl @solaris        # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_none_bka @solaris               # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_none_bkaunique @solaris         # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+main.subquery_sj_none @solaris                   # Bug#11753919 2012-02-03 didrik Several test cases fail on Solaris with error Thread stack overrun
+
 main.kill @freebsd                       # Bug#12619719 2011-08-04 Occasional failure in PB2
 
 innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in PB2
 
 rpl.rpl_change_master_dbug               # BUG#11933491 2011-06-13 Anitha  Test fails on redhat 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
-rpl.rpl_heartbeat_basic                  # BUG#12403008 2011-04-27 sven fails sporadically
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_row_sp011  @solaris              # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_seconds_behind_master            # BUG#11765124 2010-11-24 luis fails sporadically on pb2

=== modified file 'mysql-test/include/have_32bit.inc'
--- a/mysql-test/include/have_32bit.inc	2009-01-08 18:13:57 +0000
+++ b/mysql-test/include/have_32bit.inc	2012-02-03 13:49:32 +0000
@@ -3,10 +3,10 @@
 
 --disable_query_log
 --disable_warnings
-let $save = `SELECT @@global.sort_buffer_size`;
-SET @@global.sort_buffer_size = 4294967296;
-let $mach32 = `SELECT @@global.sort_buffer_size <= 4294967295`;
-eval SET @@global.sort_buffer_size = $save;
+let $save = `SELECT @@global.myisam_sort_buffer_size`;
+SET @@global.myisam_sort_buffer_size = 4294967296;
+let $mach32 = `SELECT @@global.myisam_sort_buffer_size <= 4294967295`;
+eval SET @@global.myisam_sort_buffer_size = $save;
 --enable_warnings
 --enable_query_log
 if (!$mach32)

=== modified file 'mysql-test/suite/perfschema/include/hostcache_dump.inc'
--- a/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-02-06 09:49:52 +0000
@@ -20,7 +20,6 @@ select
   COUNT_SSL_ERRORS,
   COUNT_MAX_USER_CONNECTION_ERRORS,
   COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-  COUNT_MAX_CONNECTION_ERRORS,
   COUNT_DEFAULT_DATABASE_ERRORS,
   COUNT_INIT_CONNECT_ERRORS,
   COUNT_LOCAL_ERRORS,

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-02-06 09:49:52 +0000
@@ -38,7 +38,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -67,7 +66,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -99,7 +97,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -128,7 +125,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-02-06 09:49:52 +0000
@@ -36,7 +36,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -65,7 +64,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -92,7 +90,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -121,7 +118,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -149,7 +145,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -178,7 +173,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -205,7 +199,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -234,7 +227,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -271,7 +263,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -300,7 +291,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -93,7 +91,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -122,7 +119,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -149,7 +145,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -178,7 +173,6 @@ COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -205,7 +199,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -234,7 +227,6 @@ COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -261,7 +253,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -290,7 +281,6 @@ COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -318,7 +308,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -347,7 +336,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-02-06 09:13:43 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-02-06 09:49:52 +0000
@@ -47,7 +47,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -76,7 +75,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -108,7 +106,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -137,7 +134,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -169,7 +165,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -198,7 +193,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -225,7 +219,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -254,7 +247,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	1
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -281,7 +273,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -310,7 +301,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -347,7 +337,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -376,7 +365,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -408,7 +396,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -437,7 +424,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -469,7 +455,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -498,7 +483,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -525,7 +509,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -554,7 +537,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	1
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -581,7 +563,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -610,7 +591,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -646,7 +626,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -675,7 +654,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -707,7 +685,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -736,7 +713,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -768,7 +744,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -797,7 +772,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -824,7 +798,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -853,7 +826,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	3
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -880,7 +852,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -909,7 +880,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -944,7 +914,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -973,7 +942,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -1005,7 +973,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -1034,7 +1001,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -1061,7 +1027,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -1090,7 +1055,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	1
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -1117,7 +1081,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -1146,7 +1109,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-02-06 09:49:52 +0000
@@ -38,7 +38,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -67,7 +66,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -99,7 +97,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -128,7 +125,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -161,7 +157,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -190,7 +185,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -222,7 +216,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -251,7 +244,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -144,7 +140,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -173,7 +168,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -200,7 +194,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -229,7 +222,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-02-06 09:49:52 +0000
@@ -30,7 +30,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -59,7 +58,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -86,7 +84,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -115,7 +112,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-02-06 09:49:52 +0000
@@ -38,7 +38,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -67,7 +66,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -99,7 +97,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -128,7 +125,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-02-06 09:49:52 +0000
@@ -36,7 +36,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -65,7 +64,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -92,7 +90,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -121,7 +118,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -149,7 +145,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -178,7 +173,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -205,7 +199,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -234,7 +227,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -271,7 +263,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -300,7 +291,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -93,7 +91,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -122,7 +119,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -149,7 +145,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -178,7 +173,6 @@ COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -205,7 +199,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -234,7 +227,6 @@ COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -261,7 +253,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -290,7 +281,6 @@ COUNT_AUTHENTICATION_ERRORS	3
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -318,7 +308,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -347,7 +336,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-02-06 09:13:43 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-02-06 09:49:52 +0000
@@ -47,7 +47,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -76,7 +75,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -108,7 +106,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -137,7 +134,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -169,7 +165,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -198,7 +193,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -225,7 +219,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -254,7 +247,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	1
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -281,7 +273,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -310,7 +301,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -347,7 +337,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -376,7 +365,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -408,7 +396,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -437,7 +424,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -469,7 +455,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -498,7 +483,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -525,7 +509,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -554,7 +537,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	1
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -581,7 +563,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -610,7 +591,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -646,7 +626,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -675,7 +654,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -707,7 +685,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -736,7 +713,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -768,7 +744,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -797,7 +772,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -824,7 +798,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -853,7 +826,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	3
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -880,7 +852,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -909,7 +880,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -944,7 +914,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -973,7 +942,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -1005,7 +973,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -1034,7 +1001,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	0
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -1061,7 +1027,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -1090,7 +1055,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	1
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -1117,7 +1081,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -1146,7 +1109,6 @@ COUNT_AUTHENTICATION_ERRORS	0
 COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
-COUNT_MAX_CONNECTION_ERRORS	2
 COUNT_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-02-06 09:49:52 +0000
@@ -38,7 +38,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -67,7 +66,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -99,7 +97,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -128,7 +125,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -161,7 +157,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -190,7 +185,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -222,7 +216,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -251,7 +244,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -144,7 +140,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -173,7 +168,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -200,7 +194,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -229,7 +222,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-02-06 09:49:52 +0000
@@ -37,7 +37,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -66,7 +65,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -98,7 +96,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -127,7 +124,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-02-06 09:49:52 +0000
@@ -31,7 +31,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -60,7 +59,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
@@ -87,7 +85,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -116,7 +113,6 @@ 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_DEFAULT_DATABASE_ERRORS	0
 COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0

=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-02 18:37:22 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-06 09:49:52 +0000
@@ -46,7 +46,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
@@ -82,7 +81,6 @@ COUNT_AUTHENTICATION_ERRORS,
 COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
-COUNT_MAX_CONNECTION_ERRORS,
 COUNT_DEFAULT_DATABASE_ERRORS,
 COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2012-02-03 23:52:29 +0000
@@ -96,4 +96,27 @@ drop table t1;
 include/stop_slave.inc
 CHANGE MASTER TO master_host='SAVE_MASTER_HOST';
 include/start_slave.inc
+include/rpl_reset.inc
+include/stop_slave.inc
+CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='', MASTER_PORT=MASTER_PORT;
+ERROR HY000: Incorrect arguments to MASTER_HOST
+CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1\n127.0.0.1', MASTER_PORT=MASTER_PORT;
+ERROR HY000: Incorrect argument contains not-allowed LF value: '127.0.0.1
+127.0.0.1'
+CHANGE MASTER TO MASTER_USER='root\n', MASTER_HOST='master2.mycompany.com', MASTER_PORT=MASTER_PORT, MASTER_USER='replication', MASTER_PASSWORD='bigs3cret', MASTER_LOG_FILE='master2-bin.001', MASTER_LOG_POS=4;
+ERROR HY000: Incorrect argument contains not-allowed LF value: 'root
+'
+CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='master2.mycompany.com', MASTER_PORT=MASTER_PORT, MASTER_USER='repli\ncation', MASTER_PASSWORD='bigs3cret', MASTER_LOG_FILE='master2-bin.001', MASTER_LOG_POS=4;
+ERROR HY000: Incorrect argument contains not-allowed LF value: 'repli
+cation'
+CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='master2.mycompany.com', MASTER_PORT=MASTER_PORT, MASTER_USER='replication', MASTER_PASSWORD='bigs3cret', MASTER_LOG_FILE='master2-bin.\n001', MASTER_LOG_POS=4;
+ERROR HY000: Incorrect argument contains not-allowed LF value: 'master2-bin.
+001'
+CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT;
+Warnings:
+Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+include/start_slave.inc
+Master_Host = '127.0.0.1'
+include/rpl_reset.inc
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test	2010-12-19 17:25:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test	2012-02-03 23:52:29 +0000
@@ -11,4 +11,51 @@
 
 --source include/master-slave.inc
 --source extra/rpl_tests/rpl_change_master.test
+
+
+# BUG#11758581 - 50801: CHANGE MASTER ACCEPTS BOGUS VARIABLES
+# We want to check if CHANGE MASTER values have newline characters.
+--source include/rpl_reset.inc
+connection slave;
+
+###
+### This should fail with error ER_WRONG_ARGUMENTS due to empty MASTER_HOST
+### value.
+###
+--source include/stop_slave.inc
+--replace_result $MASTER_MYPORT MASTER_PORT
+--error ER_WRONG_ARGUMENTS
+eval CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='', MASTER_PORT=$MASTER_MYPORT;
+
+###
+### This should fail with error ER_SYNTAX_ERROR due to newline
+### in string values.
+###
+--replace_result $MASTER_MYPORT MASTER_PORT
+--error ER_WRONG_VALUE
+eval CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1\n127.0.0.1', MASTER_PORT=$MASTER_MYPORT;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+--error ER_WRONG_VALUE
+eval CHANGE MASTER TO MASTER_USER='root\n', MASTER_HOST='master2.mycompany.com', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='replication', MASTER_PASSWORD='bigs3cret', MASTER_LOG_FILE='master2-bin.001', MASTER_LOG_POS=4;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+--error ER_WRONG_VALUE
+eval CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='master2.mycompany.com', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='repli\ncation', MASTER_PASSWORD='bigs3cret', MASTER_LOG_FILE='master2-bin.001', MASTER_LOG_POS=4;
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+--error ER_WRONG_VALUE
+eval CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='master2.mycompany.com', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='replication', MASTER_PASSWORD='bigs3cret', MASTER_LOG_FILE='master2-bin.\n001', MASTER_LOG_POS=4;
+
+###
+### This should be accepted.
+###
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval CHANGE MASTER TO MASTER_USER='root', MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT;
+
+--source include/start_slave.inc
+--let $status_items= Master_Host
+--source include/show_slave_status.inc
+--source include/rpl_reset.inc
+
 --source include/rpl_end.inc

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2011-12-19 12:53:11 +0000
+++ b/sql/sql_yacc.yy	2012-02-03 18:09:00 +0000
@@ -1504,7 +1504,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
         IDENT_sys TEXT_STRING_sys TEXT_STRING_literal
         NCHAR_STRING opt_component key_cache_name
         sp_opt_label BIN_NUM label_ident TEXT_STRING_filesystem ident_or_empty
-        opt_constraint constraint opt_ident
+        opt_constraint constraint opt_ident TEXT_STRING_sys_nonewline
 
 %type <lex_str_ptr>
         opt_table_alias
@@ -1983,19 +1983,19 @@ master_defs:
         ;
 
 master_def:
-          MASTER_HOST_SYM EQ TEXT_STRING_sys
+          MASTER_HOST_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.host = $3.str;
           }
-        | MASTER_BIND_SYM EQ TEXT_STRING_sys
+        | MASTER_BIND_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.bind_addr = $3.str;
           }
-        | MASTER_USER_SYM EQ TEXT_STRING_sys
+        | MASTER_USER_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.user = $3.str;
           }
-        | MASTER_PASSWORD_SYM EQ TEXT_STRING_sys
+        | MASTER_PASSWORD_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.password = $3.str;
           }
@@ -2027,23 +2027,23 @@ master_def:
             Lex->mi.ssl= $3 ? 
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
           }
-        | MASTER_SSL_CA_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_CA_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_ca= $3.str;
           }
-        | MASTER_SSL_CAPATH_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_CAPATH_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_capath= $3.str;
           }
-        | MASTER_SSL_CERT_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_CERT_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_cert= $3.str;
           }
-        | MASTER_SSL_CIPHER_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_CIPHER_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_cipher= $3.str;
           }
-        | MASTER_SSL_KEY_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_KEY_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_key= $3.str;
           }
@@ -2052,11 +2052,11 @@ master_def:
             Lex->mi.ssl_verify_server_cert= $3 ?
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
           }
-        | MASTER_SSL_CRL_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_CRL_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_crl= $3.str;
           }
-        | MASTER_SSL_CRLPATH_SYM EQ TEXT_STRING_sys
+        | MASTER_SSL_CRLPATH_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.ssl_crlpath= $3.str;
           }
@@ -2121,7 +2121,7 @@ ignore_server_id:
           }
 
 master_file_def:
-          MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
+          MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.log_file_name = $3.str;
           }
@@ -2141,7 +2141,7 @@ master_file_def:
             */
             Lex->mi.pos = max<ulonglong>(BIN_LOG_HEADER_SIZE, Lex->mi.pos);
           }
-        | RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys
+        | RELAY_LOG_FILE_SYM EQ TEXT_STRING_sys_nonewline
           {
             Lex->mi.relay_log_name = $3.str;
           }
@@ -12814,6 +12814,19 @@ IDENT_sys:
             }
           }
         ;
+
+TEXT_STRING_sys_nonewline:
+          TEXT_STRING_sys
+          {
+            if (!strcont($1.str, "\n"))
+              $$= $1;
+            else
+            {
+              my_error(ER_WRONG_VALUE, MYF(0), "argument contains not-allowed LF", $1.str);
+              MYSQL_YYABORT;
+            }
+          }
+        ;
 
 TEXT_STRING_sys:
           TEXT_STRING

=== modified file 'storage/archive/ha_archive.cc'
--- a/storage/archive/ha_archive.cc	2012-01-31 15:16:16 +0000
+++ b/storage/archive/ha_archive.cc	2012-02-03 14:37:46 +0000
@@ -294,6 +294,15 @@ err:
   DBUG_RETURN(1);
 }
 
+static void save_auto_increment(TABLE *table, ulonglong *value)
+{
+  Field *field= table->found_next_number_field;
+  ulonglong auto_value=
+    (ulonglong) field->val_int(table->record[0] +
+                               field->offset(table->record[0]));
+  if (*value <= auto_value)
+    *value= auto_value + 1;
+}
 
 /**
   @brief Read version 1 meta file (5.0 compatibility routine).
@@ -476,6 +485,7 @@ ARCHIVE_SHARE *ha_archive::get_share(con
     share->table_name= tmp_name;
     share->crashed= FALSE;
     share->archive_write_open= FALSE;
+    share->in_optimize= false;
     fn_format(share->data_file_name, table_name, "",
               ARZ, MY_REPLACE_EXT | MY_UNPACK_FILENAME);
     strmov(share->table_name, table_name);
@@ -1506,34 +1516,45 @@ int ha_archive::optimize(THD* thd, HA_CH
 {
   int rc= 0;
   azio_stream writer;
+  ha_rows count;
+  my_bitmap_map *org_bitmap;
   char writer_filename[FN_REFLEN];
   DBUG_ENTER("ha_archive::optimize");
 
-  init_archive_reader();
-
-  // now we close both our writer and our reader for the rename
-  if (share->archive_write_open)
+  mysql_mutex_lock(&share->mutex);
+  if (share->in_optimize)
   {
-    if (share->archive_write.version == 1)
-      write_v1_metafile();
-    azclose(&(share->archive_write));
-    share->archive_write_open= FALSE;
+    mysql_mutex_unlock(&share->mutex);
+    DBUG_RETURN(HA_ADMIN_FAILED);
   }
+  share->in_optimize= true;
+  /* remember the number of rows */
+  count= share->rows_recorded;
+  if (share->archive_write_open)
+    azflush(&share->archive_write, Z_SYNC_FLUSH);
+  mysql_mutex_unlock(&share->mutex);
+
+  init_archive_reader();
 
   /* Lets create a file to contain the new data */
   fn_format(writer_filename, share->table_name, "", ARN, 
             MY_REPLACE_EXT | MY_UNPACK_FILENAME);
 
   if (!(azopen(&writer, writer_filename, O_CREAT|O_RDWR|O_BINARY)))
-    DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE); 
+  {
+    share->in_optimize= false;
+    DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
+  }
 
   /*
     Transfer the embedded FRM so that the file can be discoverable.
     Write file offset is set to the end of the file.
   */
   if ((rc= frm_copy(&archive, &writer)))
+  {
+    share->in_optimize= false;
     goto error;
-
+  }
   /* 
     An extended rebuild is a lot more effort. We open up each row and re-record it. 
     Any dead rows are removed (aka rows that may have been partially recorded). 
@@ -1541,75 +1562,86 @@ int ha_archive::optimize(THD* thd, HA_CH
     As of Archive format 3, this is the only type that is performed, before this
     version it was just done on T_EXTEND
   */
-  if (1)
-  {
-    DBUG_PRINT("ha_archive", ("archive extended rebuild"));
 
-    /*
-      Now we will rewind the archive file so that we are positioned at the 
-      start of the file.
-    */
-    rc= read_data_header(&archive);
+  DBUG_PRINT("ha_archive", ("archive extended rebuild"));
 
-    /* 
-      On success of writing out the new header, we now fetch each row and
-      insert it into the new archive file. 
-    */
-    if (!rc)
-    {
-      share->rows_recorded= 0;
-      stats.auto_increment_value= 1;
-      share->archive_write.auto_increment= 0;
-      my_bitmap_map *org_bitmap= tmp_use_all_columns(table, table->read_set);
+  /*
+    Now we will rewind the archive file so that we are positioned at the 
+    start of the file.
+  */
+  if ((rc= read_data_header(&archive)))
+  {
+    share->in_optimize= false;
+    goto error;
+  }
 
-      while (!(rc= get_row(&archive, table->record[0])))
-      {
-        real_write_row(table->record[0], &writer);
-        /*
-          Long term it should be possible to optimize this so that
-          it is not called on each row.
-        */
-        if (table->found_next_number_field)
-        {
-          Field *field= table->found_next_number_field;
-          ulonglong auto_value=
-            (ulonglong) field->val_int(table->record[0] +
-                                       field->offset(table->record[0]));
-          if (share->archive_write.auto_increment < auto_value)
-            stats.auto_increment_value=
-              (share->archive_write.auto_increment= auto_value) + 1;
-        }
-      }
+  stats.auto_increment_value= 1;
+  org_bitmap= tmp_use_all_columns(table, table->read_set);
+  /* read rows upto the remembered rows */ 
+  for (ha_rows cur_count= count; cur_count; cur_count--)
+  {
+    if ((rc= get_row(&archive, table->record[0])))
+      break;
+    real_write_row(table->record[0], &writer);
+    if (table->found_next_number_field)
+      save_auto_increment(table, &stats.auto_increment_value);
+  }
 
-      tmp_restore_column_map(table->read_set, org_bitmap);
-      share->rows_recorded= (ha_rows)writer.rows;
+  mysql_mutex_lock(&share->mutex);
+
+  if (share->archive_write_open)
+  {
+    if (share->archive_write.version == 1)
+      write_v1_metafile();
+    azclose(&share->archive_write);
+    share->archive_write_open= FALSE;
+  }
+  if (!rc)
+  {
+    /* read the remaining rows */
+    for (count= share->rows_recorded - count; count; count--)
+    {
+      if ((rc= get_row(&archive, table->record[0])))
+        break;
+      real_write_row(table->record[0], &writer);
+      if (table->found_next_number_field)
+        save_auto_increment(table, &stats.auto_increment_value);
     }
+  }
 
-    DBUG_PRINT("info", ("recovered %llu archive rows", 
-                        (unsigned long long)share->rows_recorded));
+  tmp_restore_column_map(table->read_set, org_bitmap);
+  share->rows_recorded= (ha_rows) writer.rows;
+  share->archive_write.auto_increment= stats.auto_increment_value - 1;
+  DBUG_PRINT("info", ("recovered %llu archive rows", 
+                      (unsigned long long)share->rows_recorded));
 
-    DBUG_PRINT("ha_archive", ("recovered %llu archive rows", 
-                        (unsigned long long)share->rows_recorded));
+  DBUG_PRINT("ha_archive", ("recovered %llu archive rows", 
+                      (unsigned long long)share->rows_recorded));
 
-    /*
-      If REPAIR ... EXTENDED is requested, try to recover as much data
-      from data file as possible. In this case if we failed to read a
-      record, we assume EOF. This allows massive data loss, but we can
-      hardly do more with broken zlib stream. And this is the only way
-      to restore at least what is still recoverable.
-    */
-    if (rc && rc != HA_ERR_END_OF_FILE && !(check_opt->flags & T_EXTEND))
-      goto error;
-  } 
+  /*
+    If REPAIR ... EXTENDED is requested, try to recover as much data
+    from data file as possible. In this case if we failed to read a
+    record, we assume EOF. This allows massive data loss, but we can
+    hardly do more with broken zlib stream. And this is the only way
+    to restore at least what is still recoverable.
+  */
+  if (rc && rc != HA_ERR_END_OF_FILE && !(check_opt->flags & T_EXTEND))
+  {
+    share->in_optimize= false;
+    mysql_mutex_unlock(&share->mutex);
+    goto error;
+  }
 
   azclose(&writer);
   share->dirty= FALSE;
-  
-  azclose(&archive);
 
   // make the file we just wrote be our data file
   rc= my_rename(writer_filename, share->data_file_name, MYF(0));
+  share->in_optimize= false;
+  mysql_mutex_unlock(&share->mutex);
 
+  azclose(&archive);
+  archive_reader_open= FALSE;
 
   DBUG_RETURN(rc);
 error:

=== modified file 'storage/archive/ha_archive.h'
--- a/storage/archive/ha_archive.h	2011-10-07 06:03:14 +0000
+++ b/storage/archive/ha_archive.h	2012-02-03 14:37:46 +0000
@@ -35,6 +35,7 @@ typedef struct st_archive_share {
   mysql_mutex_t mutex;
   THR_LOCK lock;
   azio_stream archive_write;     /* Archive file we are working with */
+  bool in_optimize;
   bool archive_write_open;
   bool dirty;               /* Flag for if a flush should occur */
   bool crashed;             /* Meta file is crashed */

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