From: Marc Alff Date: February 7 2012 2:35pm Subject: bzr push into mysql-trunk-wl5259 branch (marc.alff:3373 to 3374) List-Archive: http://lists.mysql.com/commits/142780 Message-Id: <201202071436.q17Ea8D4000810@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3374 Marc Alff 2012-02-07 Plugin API improvements, for column AUTH_PLUGIN modified: include/mysql/plugin_auth_common.h 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_ipv6_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/table_schema.result sql/sql_acl.cc 3373 Marc Alff 2012-02-06 [merge] Merge mysql-trunk --> mysql-trunk-wl5259, test cleanup modified: mysql-test/collections/default.experimental mysql-test/include/have_32bit.inc mysql-test/suite/perfschema/include/hostcache_dump.inc mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result mysql-test/suite/perfschema/r/hostcache_ipv4_format.result mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result mysql-test/suite/perfschema/r/hostcache_peer_addr.result mysql-test/suite/rpl/r/rpl_change_master.result mysql-test/suite/rpl/t/rpl_change_master.test sql/sql_yacc.yy storage/archive/ha_archive.cc storage/archive/ha_archive.h === modified file 'include/mysql/plugin_auth_common.h' --- a/include/mysql/plugin_auth_common.h 2011-06-30 15:46:53 +0000 +++ b/include/mysql/plugin_auth_common.h 2012-02-07 14:35:13 +0000 @@ -30,6 +30,27 @@ */ /** + Authentication failed, plugin internal error. + An error occurred in the authentication plugin itself. + These errors are reported in table performance_schema.host_cache, + column COUNT_AUTH_PLUGIN_ERRORS. +*/ +#define CR_AUTH_PLUGIN_ERROR 3 +/** + Authentication failed, client server handshake. + An error occurred during the client server handshake. + These errors are reported in table performance_schema.host_cache, + column COUNT_HANDSHAKE_ERRORS. +*/ +#define CR_AUTH_HANDSHAKE 2 +/** + Authentication failed, user credentials. + For example, wrong passwords. + These errors are reported in table performance_schema.host_cache, + column COUNT_AUTHENTICATION_ERRORS. +*/ +#define CR_AUTH_USER_CREDENTIALS 1 +/** Authentication failed. Additionally, all other CR_xxx values (libmysql error code) can be used too. === 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-06 09:49:52 +0000 +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result 2012-02-07 14:35:13 +0000 @@ -56,11 +56,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 1 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 1 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 1 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -110,11 +110,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -165,11 +165,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 1 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -219,11 +219,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 2 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -283,11 +283,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 2 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 === modified file 'mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result' --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result 2012-02-06 09:49:52 +0000 +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result 2012-02-07 14:35:13 +0000 @@ -61,7 +61,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 1 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 1 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -115,7 +115,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 2 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -169,7 +169,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 3 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 3 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -223,7 +223,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 3 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 3 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -277,7 +277,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 3 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 3 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -332,7 +332,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 1 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 1 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 === modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result' --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result 2012-02-06 09:49:52 +0000 +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result 2012-02-07 14:35:13 +0000 @@ -56,11 +56,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 1 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 1 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 1 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -110,11 +110,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -165,11 +165,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 1 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -219,11 +219,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 2 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -283,11 +283,11 @@ COUNT_ADDRINFO_PERMANENT_ERRORS 0 COUNT_FCRDNS_ERRORS 0 COUNT_HOST_ACL_ERRORS 0 COUNT_NO_AUTH_PLUGIN_ERRORS 2 -COUNT_AUTH_PLUGIN_ERRORS 0 +COUNT_AUTH_PLUGIN_ERRORS 2 COUNT_HANDSHAKE_ERRORS 0 COUNT_PROXY_USER_ERRORS 2 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 === modified file 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result' --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result 2012-02-06 09:49:52 +0000 +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result 2012-02-07 14:35:13 +0000 @@ -61,7 +61,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 1 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 1 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -115,7 +115,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 2 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 2 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -169,7 +169,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 3 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 3 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -223,7 +223,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 3 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 3 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -277,7 +277,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 3 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 3 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 @@ -332,7 +332,7 @@ COUNT_AUTH_PLUGIN_ERRORS 0 COUNT_HANDSHAKE_ERRORS 1 COUNT_PROXY_USER_ERRORS 0 COUNT_PROXY_USER_ACL_ERRORS 0 -COUNT_AUTHENTICATION_ERRORS 1 +COUNT_AUTHENTICATION_ERRORS 0 COUNT_SSL_ERRORS 0 COUNT_MAX_USER_CONNECTION_ERRORS 0 COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0 === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result 2012-02-02 18:37:22 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result 2012-02-07 14:35:13 +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 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. +ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists +ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 705: Table 'threads' already exists +ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -90,40 +90,40 @@ ERROR 1050 (42S01) at line 322: Table 'f ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 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. +ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists +ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 705: Table 'threads' already exists +ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -152,40 +152,40 @@ ERROR 1050 (42S01) at line 322: Table 'f ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 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. +ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists +ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 705: Table 'threads' already exists +ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -214,40 +214,40 @@ ERROR 1050 (42S01) at line 322: Table 'f ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 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. +ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists +ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 705: Table 'threads' already exists +ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -276,40 +276,40 @@ ERROR 1050 (42S01) at line 322: Table 'f ERROR 1050 (42S01) at line 335: Table 'socket_instances' already exists ERROR 1050 (42S01) at line 365: Table 'socket_summary_by_instance' already exists ERROR 1050 (42S01) at line 394: Table 'socket_summary_by_event_name' already exists -ERROR 1050 (42S01) at line 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. +ERROR 1050 (42S01) at line 429: Table 'host_cache' already exists +ERROR 1050 (42S01) at line 438: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 452: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 462: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 472: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 481: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 489: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 498: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 509: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 517: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 562: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 606: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 685: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 705: Table 'threads' already exists +ERROR 1050 (42S01) at line 721: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 737: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 753: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 766: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 779: Table 'events_stages_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 792: Table 'events_stages_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 806: Table 'events_stages_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 818: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 862: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 906: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists +ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists +ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists +ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists +ERROR 1050 (42S01) at line 1128: Table 'users' already exists +ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists +ERROR 1644 (HY000) at line 1558: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.event where db='performance_schema'; name === modified file 'mysql-test/suite/perfschema/r/schema.result' --- a/mysql-test/suite/perfschema/r/schema.result 2012-02-02 18:37:22 +0000 +++ b/mysql-test/suite/perfschema/r/schema.result 2012-02-07 14:35:13 +0000 @@ -665,7 +665,6 @@ host_cache CREATE TABLE `host_cache` ( `COUNT_SSL_ERRORS` bigint(20) NOT NULL, `COUNT_MAX_USER_CONNECTION_ERRORS` bigint(20) NOT NULL, `COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS` bigint(20) NOT NULL, - `COUNT_MAX_CONNECTION_ERRORS` bigint(20) NOT NULL, `COUNT_DEFAULT_DATABASE_ERRORS` bigint(20) NOT NULL, `COUNT_INIT_CONNECT_ERRORS` bigint(20) NOT NULL, `COUNT_LOCAL_ERRORS` bigint(20) NOT NULL, === modified file 'mysql-test/suite/perfschema/r/table_schema.result' --- a/mysql-test/suite/perfschema/r/table_schema.result 2012-02-02 18:37:22 +0000 +++ b/mysql-test/suite/perfschema/r/table_schema.result 2012-02-07 14:35:13 +0000 @@ -490,15 +490,14 @@ def performance_schema host_cache COUNT_ def performance_schema host_cache COUNT_SSL_ERRORS 19 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema host_cache COUNT_MAX_USER_CONNECTION_ERRORS 20 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references def performance_schema host_cache COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 21 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references -def performance_schema host_cache COUNT_MAX_CONNECTION_ERRORS 22 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references -def performance_schema host_cache COUNT_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 host_cache COUNT_DEFAULT_DATABASE_ERRORS 22 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_INIT_CONNECT_ERRORS 23 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_LOCAL_ERRORS 24 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache COUNT_UNKNOWN_ERRORS 25 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references +def performance_schema host_cache FIRST_SEEN 26 0000-00-00 00:00:00.000000 NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) select,insert,update,references +def performance_schema host_cache LAST_SEEN 27 0000-00-00 00:00:00.000000 NO timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) select,insert,update,references +def performance_schema host_cache FIRST_ERROR_SEEN 28 0000-00-00 00:00:00.000000 YES timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) select,insert,update,references +def performance_schema host_cache LAST_ERROR_SEEN 29 0000-00-00 00:00:00.000000 YES timestamp NULL NULL NULL NULL 6 NULL NULL timestamp(6) select,insert,update,references def performance_schema mutex_instances NAME 1 NULL NO varchar 128 384 NULL NULL NULL utf8 utf8_general_ci varchar(128) select,insert,update,references def performance_schema mutex_instances OBJECT_INSTANCE_BEGIN 2 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def performance_schema mutex_instances LOCKED_BY_THREAD_ID 3 NULL YES int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references === modified file 'sql/sql_acl.cc' --- a/sql/sql_acl.cc 2012-02-06 09:13:43 +0000 +++ b/sql/sql_acl.cc 2012-02-07 14:35:13 +0000 @@ -9173,9 +9173,6 @@ static int server_mpvio_read_packet(MYSQ err: if (mpvio->status == MPVIO_EXT::FAILURE) { - Host_errors errors; - errors.m_handshake= 1; - inc_host_errors(mpvio->ip, &errors); my_error(ER_HANDSHAKE_ERROR, MYF(0)); } DBUG_RETURN(-1); @@ -9511,9 +9508,25 @@ acl_authenticate(THD *thd, uint com_chan if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS) { - DBUG_ASSERT(mpvio.status == MPVIO_EXT::FAILURE); Host_errors errors; - errors.m_authentication= 1; + DBUG_ASSERT(mpvio.status == MPVIO_EXT::FAILURE); + switch (res) + { + case CR_AUTH_PLUGIN_ERROR: + errors.m_auth_plugin= 1; + break; + case CR_AUTH_HANDSHAKE: + errors.m_handshake= 1; + break; + case CR_AUTH_USER_CREDENTIALS: + errors.m_authentication= 1; + break; + case CR_ERROR: + default: + /* Unknown of unspecified auth plugin error. */ + errors.m_auth_plugin= 1; + break; + } inc_host_errors(mpvio.ip, &errors); if (!thd->is_error()) login_failed_error(&mpvio, mpvio.auth_info.password_used); @@ -9713,7 +9726,7 @@ static int native_password_authenticate( /* send it to the client */ if (mpvio->write_packet(mpvio, (uchar*) mpvio->scramble, SCRAMBLE_LENGTH + 1)) - DBUG_RETURN(CR_ERROR); + DBUG_RETURN(CR_AUTH_HANDSHAKE); /* reply and authenticate */ @@ -9754,7 +9767,7 @@ static int native_password_authenticate( /* read the reply with the encrypted password */ if ((pkt_len= mpvio->read_packet(mpvio, &pkt)) < 0) - DBUG_RETURN(CR_ERROR); + DBUG_RETURN(CR_AUTH_HANDSHAKE); DBUG_PRINT("info", ("reply read : pkt_len=%d", pkt_len)); #ifdef NO_EMBEDDED_ACCESS_CHECKS @@ -9768,23 +9781,20 @@ static int native_password_authenticate( ); if (pkt_len == 0) /* no password */ - DBUG_RETURN(mpvio->acl_user->salt_len != 0 ? CR_ERROR : CR_OK); + DBUG_RETURN(mpvio->acl_user->salt_len != 0 ? CR_AUTH_USER_CREDENTIALS : CR_OK); info->password_used= PASSWORD_USED_YES; if (pkt_len == SCRAMBLE_LENGTH) { if (!mpvio->acl_user->salt_len) - DBUG_RETURN(CR_ERROR); + DBUG_RETURN(CR_AUTH_USER_CREDENTIALS); DBUG_RETURN(check_scramble(pkt, mpvio->scramble, mpvio->acl_user->salt) ? - CR_ERROR : CR_OK); + CR_AUTH_USER_CREDENTIALS : CR_OK); } - Host_errors errors; - errors.m_handshake= 1; - inc_host_errors(mpvio->ip, &errors); my_error(ER_HANDSHAKE_ERROR, MYF(0)); - DBUG_RETURN(CR_ERROR); + DBUG_RETURN(CR_AUTH_HANDSHAKE); } static int old_password_authenticate(MYSQL_PLUGIN_VIO *vio, @@ -9800,11 +9810,11 @@ static int old_password_authenticate(MYS /* send it to the client */ if (mpvio->write_packet(mpvio, (uchar*) mpvio->scramble, SCRAMBLE_LENGTH + 1)) - return CR_ERROR; + return CR_AUTH_HANDSHAKE; /* read the reply and authenticate */ if ((pkt_len= mpvio->read_packet(mpvio, &pkt)) < 0) - return CR_ERROR; + return CR_AUTH_HANDSHAKE; #ifdef NO_EMBEDDED_ACCESS_CHECKS return CR_OK; @@ -9819,28 +9829,25 @@ static int old_password_authenticate(MYS pkt_len= strnlen((char*)pkt, pkt_len); if (pkt_len == 0) /* no password */ - return mpvio->acl_user->salt_len != 0 ? CR_ERROR : CR_OK; + return mpvio->acl_user->salt_len != 0 ? CR_AUTH_USER_CREDENTIALS : CR_OK; if (secure_auth(mpvio)) - return CR_ERROR; + return CR_AUTH_HANDSHAKE; info->password_used= PASSWORD_USED_YES; if (pkt_len == SCRAMBLE_LENGTH_323) { if (!mpvio->acl_user->salt_len) - return CR_ERROR; + return CR_AUTH_USER_CREDENTIALS; return check_scramble_323(pkt, mpvio->scramble, - (ulong *) mpvio->acl_user->salt) ? - CR_ERROR : CR_OK; + (ulong *) mpvio->acl_user->salt) ? + CR_AUTH_USER_CREDENTIALS : CR_OK; } - Host_errors errors; - errors.m_handshake= 1; - inc_host_errors(mpvio->ip, &errors); my_error(ER_HANDSHAKE_ERROR, MYF(0)); - return CR_ERROR; + return CR_AUTH_HANDSHAKE; } static struct st_mysql_auth native_password_handler= No bundle (reason: useless for push emails).