List:Commits« Previous MessageNext Message »
From:Marc Alff Date:February 2 2012 6:38pm
Subject:bzr push into mysql-trunk-wl5259 branch (marc.alff:3369 to 3370)
View as plain text  
 3370 Marc Alff	2012-02-02
      Work in progress

    modified:
      mysql-test/suite/perfschema/include/hostcache_dump.inc
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
      mysql-test/suite/perfschema/r/hostcache_ipv4_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/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/table_schema.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/sql_acl.cc
      sql/sql_connect.cc
      storage/perfschema/table_host_cache.cc
      storage/perfschema/table_host_cache.h
 3369 Marc Alff	2012-02-02 [merge]
      Merge mysql-trunk --> mysql-trunk-wl5259

    removed:
      include/byteorder/
    renamed:
      include/byteorder/big_endian.h => include/big_endian.h
      include/byteorder/byte_order_generic.h => include/byte_order_generic.h
      include/byteorder/byte_order_generic_x86.h => include/byte_order_generic_x86.h
      include/byteorder/byte_order_generic_x86_64.h => include/byte_order_generic_x86_64.h
      include/byteorder/little_endian.h => include/little_endian.h
    modified:
      include/CMakeLists.txt
      include/my_byteorder.h
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/include/icp_tests.inc
      mysql-test/include/order_by.inc
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/join_cache_nojb.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/optimizer_debug_sync.result
      mysql-test/r/order_by_all.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/t/optimizer_debug_sync.test
      sql/sql_select.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/univ.i
=== modified file 'mysql-test/suite/perfschema/include/hostcache_dump.inc'
--- a/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-01-27 12:14:54 +0000
+++ b/mysql-test/suite/perfschema/include/hostcache_dump.inc	2012-02-02 18:37:22 +0000
@@ -21,7 +21,8 @@ select
   COUNT_MAX_USER_CONNECTION_ERRORS,
   COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
   COUNT_MAX_CONNECTION_ERRORS,
-  COUNT_USER_ACL_ERRORS,
+  COUNT_DEFAULT_DATABASE_ERRORS,
+  COUNT_INIT_CONNECT_ERRORS,
   COUNT_LOCAL_ERRORS,
   COUNT_UNKNOWN_ERRORS,
   if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result	2012-02-02 18:37:22 +0000
@@ -39,7 +39,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -67,7 +68,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -98,7 +100,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -126,7 +129,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result	2012-02-02 18:37:22 +0000
@@ -37,7 +37,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -65,7 +66,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -91,7 +93,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -119,7 +122,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -146,7 +150,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -174,7 +179,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -200,7 +206,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -228,7 +235,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -264,7 +272,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -292,7 +301,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -92,7 +94,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -120,7 +123,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -146,7 +150,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -174,7 +179,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -200,7 +206,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -228,7 +235,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -254,7 +262,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -282,7 +291,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -309,7 +319,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -337,7 +348,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_format.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result	2012-02-02 18:37:22 +0000
@@ -48,7 +48,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -76,7 +77,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -107,7 +109,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -135,7 +138,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -166,7 +170,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -194,7 +199,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -220,7 +226,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -248,7 +255,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	1
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -274,7 +282,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -302,7 +311,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -338,7 +348,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -366,7 +377,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -397,7 +409,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -425,7 +438,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -456,7 +470,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -484,7 +499,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -510,7 +526,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -538,7 +555,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	1
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -564,7 +582,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -592,7 +611,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -627,7 +647,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -655,7 +676,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -686,7 +708,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -714,7 +737,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -745,7 +769,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -773,7 +798,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -799,7 +825,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -827,7 +854,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	3
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -853,7 +881,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -881,7 +910,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -914,7 +944,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -942,7 +973,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -973,7 +1005,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -1001,7 +1034,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -1027,7 +1061,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -1055,7 +1090,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	1
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -1081,7 +1117,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -1109,7 +1146,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	2
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result	2012-02-02 18:37:22 +0000
@@ -39,7 +39,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -67,7 +68,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -98,7 +100,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -126,7 +129,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -158,7 +162,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -186,7 +191,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -217,7 +223,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -245,7 +252,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -141,7 +145,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -169,7 +174,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -195,7 +201,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -223,7 +230,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result	2012-02-02 18:37:22 +0000
@@ -31,7 +31,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -59,7 +60,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -85,7 +87,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -113,7 +116,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result	2012-02-02 18:37:22 +0000
@@ -39,7 +39,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -67,7 +68,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -98,7 +100,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -126,7 +129,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result	2012-02-02 18:37:22 +0000
@@ -37,7 +37,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -65,7 +66,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -91,7 +93,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -119,7 +122,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -146,7 +150,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -174,7 +179,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -200,7 +206,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -228,7 +235,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -264,7 +272,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -292,7 +301,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result'
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -92,7 +94,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -120,7 +123,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -146,7 +150,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -174,7 +179,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -200,7 +206,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -228,7 +235,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -254,7 +262,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -282,7 +291,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -309,7 +319,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -337,7 +348,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result	2012-02-02 18:37:22 +0000
@@ -48,7 +48,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -76,7 +77,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -107,7 +109,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -135,7 +138,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -166,7 +170,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -194,7 +199,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	null
@@ -220,7 +226,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -248,7 +255,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	1
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -274,7 +282,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -302,7 +311,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -338,7 +348,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -366,7 +377,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -397,7 +409,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -425,7 +438,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -456,7 +470,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -484,7 +499,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -510,7 +526,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -538,7 +555,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	1
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -564,7 +582,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -592,7 +611,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -627,7 +647,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -655,7 +676,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -686,7 +708,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -714,7 +737,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -745,7 +769,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -773,7 +798,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	2
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -799,7 +825,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -827,7 +854,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	3
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -853,7 +881,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -881,7 +910,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -914,7 +944,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -942,7 +973,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -973,7 +1005,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -1001,7 +1034,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -1027,7 +1061,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -1055,7 +1090,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	1
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -1081,7 +1117,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -1109,7 +1146,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	4
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	2
 COUNT_MAX_CONNECTION_ERRORS	2
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result	2012-02-02 18:37:22 +0000
@@ -39,7 +39,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -67,7 +68,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -98,7 +100,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -126,7 +129,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -158,7 +162,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -186,7 +191,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -217,7 +223,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -245,7 +252,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -141,7 +145,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -169,7 +174,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -195,7 +201,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -223,7 +230,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result	2012-02-02 18:37:22 +0000
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== 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-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result	2012-02-02 18:37:22 +0000
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS	0
 COUNT_MAX_USER_CONNECTION_ERRORS	0
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	0
 COUNT_MAX_CONNECTION_ERRORS	0
-COUNT_USER_ACL_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
 COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set

=== modified file 'mysql-test/suite/perfschema/r/hostcache_peer_addr.result'
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result	2012-02-02 18:37:22 +0000
@@ -47,7 +47,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -82,7 +83,8 @@ COUNT_SSL_ERRORS,
 COUNT_MAX_USER_CONNECTION_ERRORS,
 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
 COUNT_MAX_CONNECTION_ERRORS,
-COUNT_USER_ACL_ERRORS,
+COUNT_DEFAULT_DATABASE_ERRORS,
+COUNT_INIT_CONNECT_ERRORS,
 COUNT_LOCAL_ERRORS,
 COUNT_UNKNOWN_ERRORS,
 if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2012-01-26 10:10:55 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2012-02-02 18:37:22 +0000
@@ -26,40 +26,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 430: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 439: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 463: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 473: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 482: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 490: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 499: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 510: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 518: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 563: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 607: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 686: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 706: Table 'threads' already exists
+ERROR 1050 (42S01) at line 722: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 738: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 754: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 767: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 780: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 793: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 807: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 819: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 863: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 951: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 983: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1015: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1080: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1120: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1129: Table 'users' already exists
+ERROR 1050 (42S01) at line 1139: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1559: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -90,40 +90,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 430: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 439: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 463: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 473: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 482: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 490: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 499: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 510: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 518: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 563: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 607: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 686: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 706: Table 'threads' already exists
+ERROR 1050 (42S01) at line 722: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 738: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 754: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 767: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 780: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 793: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 807: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 819: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 863: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 951: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 983: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1015: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1080: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1120: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1129: Table 'users' already exists
+ERROR 1050 (42S01) at line 1139: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1559: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -152,40 +152,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 430: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 439: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 463: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 473: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 482: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 490: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 499: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 510: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 518: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 563: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 607: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 686: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 706: Table 'threads' already exists
+ERROR 1050 (42S01) at line 722: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 738: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 754: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 767: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 780: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 793: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 807: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 819: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 863: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 951: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 983: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1015: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1080: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1120: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1129: Table 'users' already exists
+ERROR 1050 (42S01) at line 1139: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1559: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -214,40 +214,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 430: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 439: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 463: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 473: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 482: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 490: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 499: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 510: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 518: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 563: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 607: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 686: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 706: Table 'threads' already exists
+ERROR 1050 (42S01) at line 722: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 738: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 754: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 767: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 780: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 793: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 807: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 819: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 863: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 951: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 983: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1015: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1080: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1120: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1129: Table 'users' already exists
+ERROR 1050 (42S01) at line 1139: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1559: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -276,40 +276,40 @@ ERROR 1050 (42S01) at line 322: Table 'f
 ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists
 ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 705: Table 'threads' already exists
-ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1128: Table 'users' already exists
-ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 430: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 439: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 453: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 463: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 473: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 482: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 490: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 499: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 510: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 518: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 563: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 607: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 686: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 706: Table 'threads' already exists
+ERROR 1050 (42S01) at line 722: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 738: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 754: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 767: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 780: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 793: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 807: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 819: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 863: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 951: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 983: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1015: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1047: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1080: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1111: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1120: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1129: Table 'users' already exists
+ERROR 1050 (42S01) at line 1139: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1559: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2012-01-26 10:10:55 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2012-02-02 18:37:22 +0000
@@ -666,7 +666,8 @@ host_cache	CREATE TABLE `host_cache` (
   `COUNT_MAX_USER_CONNECTION_ERRORS` bigint(20) NOT NULL,
   `COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS` bigint(20) NOT NULL,
   `COUNT_MAX_CONNECTION_ERRORS` bigint(20) NOT NULL,
-  `COUNT_USER_ACL_ERRORS` bigint(20) NOT NULL,
+  `COUNT_DEFAULT_DATABASE_ERRORS` bigint(20) NOT NULL,
+  `COUNT_INIT_CONNECT_ERRORS` bigint(20) NOT NULL,
   `COUNT_LOCAL_ERRORS` bigint(20) NOT NULL,
   `COUNT_UNKNOWN_ERRORS` bigint(20) NOT NULL,
   `FIRST_SEEN` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',

=== modified file 'mysql-test/suite/perfschema/r/table_schema.result'
--- a/mysql-test/suite/perfschema/r/table_schema.result	2012-01-26 10:10:55 +0000
+++ b/mysql-test/suite/perfschema/r/table_schema.result	2012-02-02 18:37:22 +0000
@@ -491,13 +491,14 @@ def	performance_schema	host_cache	COUNT_
 def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTION_ERRORS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
 def	performance_schema	host_cache	COUNT_MAX_CONNECTION_ERRORS	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_USER_ACL_ERRORS	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_LOCAL_ERRORS	24	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	COUNT_UNKNOWN_ERRORS	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	host_cache	FIRST_SEEN	26	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
-def	performance_schema	host_cache	LAST_SEEN	27	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
-def	performance_schema	host_cache	FIRST_ERROR_SEEN	28	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
-def	performance_schema	host_cache	LAST_ERROR_SEEN	29	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_DEFAULT_DATABASE_ERRORS	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_INIT_CONNECT_ERRORS	24	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_LOCAL_ERRORS	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	COUNT_UNKNOWN_ERRORS	26	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	host_cache	FIRST_SEEN	27	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	LAST_SEEN	28	0000-00-00 00:00:00.000000	NO	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	FIRST_ERROR_SEEN	29	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
+def	performance_schema	host_cache	LAST_ERROR_SEEN	30	0000-00-00 00:00:00.000000	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references	
 def	performance_schema	mutex_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
 def	performance_schema	mutex_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
 def	performance_schema	mutex_instances	LOCKED_BY_THREAD_ID	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references	

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test	2012-02-02 18:37:22 +0000
@@ -12,6 +12,9 @@
 --source include/have_debug.inc
 --source include/have_perfschema.inc
 
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
+
 flush status;
 flush hosts;
 flush user_resources;

=== modified file 'mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test'
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test	2012-02-01 17:24:09 +0000
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test	2012-02-02 18:37:22 +0000
@@ -13,9 +13,8 @@
 --source include/have_ipv6.inc
 --source include/have_perfschema.inc
 
-# [Warning] IP address '192.0.2.4' could not be resolved:
-# no reverse address mapping.
-# call mtr.add_suppression("192.0.2.4");
+# Enforce a clean state
+--source ../include/wait_for_pfs_thread_count.inc
 
 flush status;
 flush hosts;

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2012-01-26 10:10:55 +0000
+++ b/scripts/mysql_system_tables.sql	2012-02-02 18:37:22 +0000
@@ -630,7 +630,8 @@ SET @cmd="CREATE TABLE performance_schem
   "COUNT_MAX_USER_CONNECTION_ERRORS BIGINT not null,"
   "COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS BIGINT not null,"
   "COUNT_MAX_CONNECTION_ERRORS BIGINT not null,"
-  "COUNT_USER_ACL_ERRORS BIGINT not null,"
+  "COUNT_DEFAULT_DATABASE_ERRORS BIGINT not null,"
+  "COUNT_INIT_CONNECT_ERRORS BIGINT not null,"
   "COUNT_LOCAL_ERRORS BIGINT not null,"
   "COUNT_UNKNOWN_ERRORS BIGINT not null,"
   "FIRST_SEEN TIMESTAMP(6) default 0,"

=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2012-01-30 19:03:41 +0000
+++ b/sql/hostname.cc	2012-02-02 18:37:22 +0000
@@ -66,7 +66,8 @@ Host_errors::Host_errors()
   m_max_user_connection(0),
   m_max_user_connection_per_hour(0),
   m_max_connection(0),
-  m_user_acl(0),
+  m_default_database(0),
+  m_init_connect(0),
   m_local(0)
 {}
 
@@ -94,7 +95,8 @@ void Host_errors::reset()
   m_max_user_connection= 0;
   m_max_user_connection_per_hour= 0;
   m_max_connection= 0;
-  m_user_acl= 0;
+  m_default_database= 0;
+  m_init_connect= 0;
   m_local= 0;
 }
 
@@ -119,7 +121,8 @@ void Host_errors::aggregate(const Host_e
   m_max_user_connection+= errors->m_max_user_connection;
   m_max_user_connection_per_hour+= errors->m_max_user_connection_per_hour;
   m_max_connection+= errors->m_max_connection;
-  m_user_acl+= errors->m_user_acl;
+  m_default_database+= errors->m_default_database;
+  m_init_connect+= errors->m_init_connect;
   m_local+= errors->m_local;
 }
 

=== modified file 'sql/hostname.h'
--- a/sql/hostname.h	2012-01-30 19:03:41 +0000
+++ b/sql/hostname.h	2012-02-02 18:37:22 +0000
@@ -71,8 +71,10 @@ public:
   ulong m_max_user_connection_per_hour;
   /** Number of errors from max connection. */
   ulong m_max_connection;
-  /** Number of errors from user grants. */
-  ulong m_user_acl;
+  /** Number of errors from the default database. */
+  ulong m_default_database;
+  /** Number of errors from init_connect. */
+  ulong m_init_connect;
   /** Number of errors from the server itself. */
   ulong m_local;
 
@@ -96,7 +98,8 @@ public:
       || (m_max_user_connection != 0)
       || (m_max_user_connection_per_hour != 0)
       || (m_max_connection != 0)
-      || (m_user_acl != 0)
+      || (m_default_database != 0)
+      || (m_init_connect != 0)
       || (m_local != 0));
   }
 
@@ -104,9 +107,6 @@ public:
   {
     /* Current (historical) behavior: */
     m_connect= m_handshake;
-    /* Proposed behavior:
-    m_connect= m_host_acl + m_handshake + m_authentication + m_user_acl;
-    */
   }
 
   void clear_connect_errors()

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2012-01-31 09:23:16 +0000
+++ b/sql/sql_acl.cc	2012-02-02 18:37:22 +0000
@@ -9667,7 +9667,7 @@ acl_authenticate(THD *thd, uint com_chan
         thd->user_connect= 0;
       }
       Host_errors errors;
-      errors.m_user_acl= 1;
+      errors.m_default_database= 1;
       inc_host_errors(mpvio.ip, &errors);
       DBUG_RETURN(1);
     }

=== modified file 'sql/sql_connect.cc'
--- a/sql/sql_connect.cc	2012-02-01 17:24:09 +0000
+++ b/sql/sql_connect.cc	2012-02-02 18:37:22 +0000
@@ -790,6 +790,7 @@ void prepare_new_connection_state(THD* t
     execute_init_command(thd, &opt_init_connect, &LOCK_sys_init_connect);
     if (thd->is_error())
     {
+      Host_errors errors;
       ulong packet_length;
       NET *net= &thd->net;
 
@@ -819,6 +820,8 @@ void prepare_new_connection_state(THD* t
       thd->server_status&= ~SERVER_STATUS_CLEAR_SET;
       thd->protocol->end_statement();
       thd->killed = THD::KILL_CONNECTION;
+      errors.m_init_connect= 1;
+      inc_host_errors(thd->main_security_ctx.ip, &errors);
       return;
     }
 

=== modified file 'storage/perfschema/table_host_cache.cc'
--- a/storage/perfschema/table_host_cache.cc	2012-01-30 10:39:47 +0000
+++ b/storage/perfschema/table_host_cache.cc	2012-02-02 18:37:22 +0000
@@ -138,7 +138,12 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
-    { C_STRING_WITH_LEN("COUNT_USER_ACL_ERRORS") },
+    { C_STRING_WITH_LEN("COUNT_DEFAULT_DATABASE_ERRORS") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
+    { C_STRING_WITH_LEN("COUNT_INIT_CONNECT_ERRORS") },
     { C_STRING_WITH_LEN("bigint(20)") },
     { NULL, 0}
   },
@@ -176,7 +181,7 @@ static const TABLE_FIELD_TYPE field_type
 
 TABLE_FIELD_DEF
 table_host_cache::m_field_def=
-{ 29, field_types };
+{ 30, field_types };
 
 PFS_engine_table_share
 table_host_cache::m_share=
@@ -297,7 +302,8 @@ void table_host_cache::make_row(Host_ent
   row->m_count_max_user_connection_errors= entry->m_errors.m_max_user_connection;
   row->m_count_max_user_connection_per_hour_errors= entry->m_errors.m_max_user_connection_per_hour;
   row->m_count_max_connection_errors= entry->m_errors.m_max_connection;
-  row->m_count_user_acl_errors= entry->m_errors.m_user_acl;
+  row->m_count_default_database_errors= entry->m_errors.m_default_database;
+  row->m_count_init_connect_errors= entry->m_errors.m_init_connect;
   row->m_count_local_errors= entry->m_errors.m_local;
 
   /*
@@ -437,28 +443,31 @@ int table_host_cache::read_row_values(TA
       case 21: /* COUNT_MAX_CONNECTION_ERRORS */
         set_field_ulonglong(f, m_row->m_count_max_connection_errors);
         break;
-      case 22: /* COUNT_USER_ACL_ERRORS */
-        set_field_ulonglong(f, m_row->m_count_user_acl_errors);
+      case 22: /* COUNT_DEFAULT_DATABASE_ERRORS */
+        set_field_ulonglong(f, m_row->m_count_default_database_errors);
+        break;
+      case 23: /* COUNT_INIT_CONNECT_ERRORS */
+        set_field_ulonglong(f, m_row->m_count_init_connect_errors);
         break;
-      case 23: /* COUNT_LOCAL_ERRORS */
+      case 24: /* COUNT_LOCAL_ERRORS */
         set_field_ulonglong(f, m_row->m_count_local_errors);
         break;
-      case 24: /* COUNT_UNKNOWN_ERRORS */
+      case 25: /* COUNT_UNKNOWN_ERRORS */
         set_field_ulonglong(f, m_row->m_count_unknown_errors);
         break;
-      case 25: /* FIRST_SEEN */
+      case 26: /* FIRST_SEEN */
         set_field_timestamp(f, m_row->m_first_seen);
         break;
-      case 26: /* LAST_SEEN */
+      case 27: /* LAST_SEEN */
         set_field_timestamp(f, m_row->m_last_seen);
         break;
-      case 27: /* FIRST_ERROR_SEEN */
+      case 28: /* FIRST_ERROR_SEEN */
         if (m_row->m_first_error_seen != 0)
           set_field_timestamp(f, m_row->m_first_error_seen);
         else
           f->set_null();
         break;
-      case 28: /* LAST_ERROR_SEEN */
+      case 29: /* LAST_ERROR_SEEN */
         if (m_row->m_last_error_seen != 0)
           set_field_timestamp(f, m_row->m_last_error_seen);
         else

=== modified file 'storage/perfschema/table_host_cache.h'
--- a/storage/perfschema/table_host_cache.h	2012-01-26 10:10:55 +0000
+++ b/storage/perfschema/table_host_cache.h	2012-02-02 18:37:22 +0000
@@ -80,8 +80,10 @@ struct row_host_cache
   ulonglong m_count_max_user_connection_per_hour_errors;
   /** Column COUNT_MAX_CONNECTION_ERRORS. */
   ulonglong m_count_max_connection_errors;
-  /** Column COUNT_USER_ACL_ERRORS. */
-  ulonglong m_count_user_acl_errors;
+  /** Column COUNT_DEFAULT_DATABASE_ERRORS. */
+  ulonglong m_count_default_database_errors;
+  /** Column COUNT_INIT_CONNECT_ERRORS. */
+  ulonglong m_count_init_connect_errors;
   /** Column COUNT_LOCAL_ERRORS. */
   ulonglong m_count_local_errors;
   /** Column COUNT_UNKNOWN_ERRORS. */

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