5.6.17

include/mysql/psi/mysql_file.h

-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

include/mysql/psi/mysql_idle.h

-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.   
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

include/mysql/psi/mysql_stage.h

-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.   
+/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.   
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

include/mysql/psi/mysql_thread.h

-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -1167,7 +1167,7 @@ static inline int inline_mysql_cond_wait(
 static inline int inline_mysql_cond_timedwait(
   mysql_cond_t *that,
   mysql_mutex_t *mutex,
-  struct timespec *abstime
+  const struct timespec *abstime
 #ifdef HAVE_PSI_COND_INTERFACE
   , const char *src_file, uint src_line
 #endif

include/mysql/psi/psi.h

-/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -1372,7 +1372,7 @@ typedef void (*set_thread_state_v1_t)(const char* state);
   @param info the process into string
   @param info_len the process into string length
 */
-typedef void (*set_thread_info_v1_t)(const char* info, int info_len);
+typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
 
 /**
   Attach a thread instrumentation to the running thread.

include/mysql/psi/psi_abi_v1.h.pp

@@ -357,7 +357,7 @@ typedef void (*set_thread_db_v1_t)(const char* db, int db_len);
 typedef void (*set_thread_command_v1_t)(int command);
 typedef void (*set_thread_start_time_v1_t)(time_t start_time);
 typedef void (*set_thread_state_v1_t)(const char* state);
-typedef void (*set_thread_info_v1_t)(const char* info, int info_len);
+typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
 typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
 typedef void (*delete_current_thread_v1_t)(void);
 typedef void (*delete_thread_v1_t)(struct PSI_thread *thread);

mysql-test/suite/perfschema/include/disable_instruments.inc

+# Tests for the performance schema
+
+# ==========================================
+# HELPER include/disable_instruments
+# ==========================================
+#
+# ==== Usage ====
+#
+# 1. Define the instrument to be disabled/enabled:
+#
+#     let $pfs_instrument=<instrument>
+#
+#   Where <instrument> is the instrument name with or without wildcards, e.g.
+#
+#     let $pfs_instrument='%statement/sql%'
+#
+--disable_query_log ONCE
+
+eval update performance_schema.setup_instruments
+  set enabled='no', timed='no'
+  where name like $pfs_instrument;
+
+

mysql-test/suite/perfschema/include/enable_instruments.inc

+# Tests for the performance schema
+
+# ==========================================
+# HELPER include/enable_instruments
+# ==========================================
+#
+# ==== Usage ====
+#
+# 1. Define the instrument to be enabled/disabled:
+#
+#     let $pfs_instrument=<instrument>
+#
+#   Where <instrument> is the instrument name with or without wildcards, e.g.
+#
+#     let $pfs_instrument='%statement/sql%'
+#
+--disable_query_log ONCE
+
+eval update performance_schema.setup_instruments
+  set enabled='yes', timed='yes'
+  where name like $pfs_instrument;
+
+

mysql-test/suite/perfschema/include/event_aggregate_setup.inc

@@ -123,8 +123,8 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
   where name in ('statement/sql/select',
                  'statement/sql/insert',
-                 'statement/com/',
-                 'statement/com/Query',
+                 'statement/abstract/new_packet',
+                 'statement/abstract/Query',
                  'statement/com/Quit',
                  'statement/com/error');
 

mysql-test/suite/perfschema/include/rpl_statements_truncate.inc

+# Tests for the performance schema
+
+# ==========================================
+# HELPER include/rpl_truncate_statements.inc
+# ==========================================
+
+--disable_query_log
+update performance_schema.setup_instruments set enabled='no', timed='no' where name like '%statement/%';
+truncate table performance_schema.events_waits_history_long;
+truncate table performance_schema.events_statements_summary_by_digest;
+truncate table performance_schema.events_statements_history;
+truncate table performance_schema.events_statements_history_long;
+update performance_schema.setup_instruments set enabled='yes', timed='yes' where name like '%statement/%';
+--enable_query_log
+

mysql-test/suite/perfschema/include/sizing_auto.inc

@@ -2,8 +2,8 @@
 show variables like "table_definition_cache";
 show variables like "table_open_cache";
 show variables like "max_connections";
-# Results vary by platform:
-# show variables like "open_files_limit";
+# open_files_limit depends on OS configuration (ulimit -n)
+#show variables like "open_files_limit";
 show variables like "%performance_schema%";
 show status like "%performance_schema%";
 

mysql-test/suite/perfschema/r/binlog_edge_row.result

@@ -78,6 +78,8 @@ performance_schema.setup_instruments.timed= 'NO';
 update my_bh_table, performance_schema.setup_instruments
 set my_bh_table.a = my_bh_table.a + 1,
 performance_schema.setup_instruments.timed= 'NO';
+Warnings:
+Warning	1870	Row events are not logged for UPDATE statements that modify BLACKHOLE tables in row format. Table(s): 'my_bh_table.'
 use test;
 drop table if exists marker_multi_delete;
 Warnings:
@@ -101,6 +103,8 @@ delete my_bh_table.*, performance_schema.setup_actors.*
 from my_bh_table, performance_schema.setup_actors
 where my_bh_table.a != 1000
 or performance_schema.setup_actors.role='BAZ';
+Warnings:
+Warning	1870	Row events are not logged for DELETE statements that modify BLACKHOLE tables in row format. Table(s): 'my_bh_table.'
 use test;
 drop table if exists marker_end;
 Warnings:

mysql-test/suite/perfschema/r/dml_setup_instruments.result

@@ -19,6 +19,9 @@ where name like 'Wait/Synch/Rwlock/sql/%'
   and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')
 order by name limit 10;
 NAME	ENABLED	TIMED
+wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock	YES	YES
+wait/synch/rwlock/sql/Binlog_storage_delegate::lock	YES	YES
+wait/synch/rwlock/sql/Binlog_transmit_delegate::lock	YES	YES
 wait/synch/rwlock/sql/gtid_commit_rollback	YES	YES
 wait/synch/rwlock/sql/LOCK_dboptions	YES	YES
 wait/synch/rwlock/sql/LOCK_grant	YES	YES
@@ -26,9 +29,6 @@ wait/synch/rwlock/sql/LOCK_system_variables_hash	YES	YES
 wait/synch/rwlock/sql/LOCK_sys_init_connect	YES	YES
 wait/synch/rwlock/sql/LOCK_sys_init_slave	YES	YES
 wait/synch/rwlock/sql/LOGGER::LOCK_logger	YES	YES
-wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for	YES	YES
-wait/synch/rwlock/sql/MDL_lock::rwlock	YES	YES
-wait/synch/rwlock/sql/Query_cache_query::lock	YES	YES
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Cond/sql/%'
   and name not in (

mysql-test/suite/perfschema/r/func_file_io.result

@@ -3,6 +3,7 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES'
 WHERE name LIKE 'wait/io/file/%';
 update performance_schema.threads SET instrumented = 'YES'
   WHERE PROCESSLIST_ID=connection_id();
+truncate table performance_schema.events_statements_summary_by_digest;
 flush status;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')

mysql-test/suite/perfschema/r/func_mutex.result

@@ -2,6 +2,7 @@ UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
 UPDATE performance_schema.setup_instruments SET enabled = 'YES'
 WHERE name LIKE 'wait/synch/mutex/%'
    OR name LIKE 'wait/synch/rwlock/%';
+truncate table performance_schema.events_statements_summary_by_digest;
 flush status;
 select NAME from performance_schema.mutex_instances
 where NAME = 'wait/synch/mutex/sql/LOCK_open';

mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result

@@ -23,8 +23,10 @@ User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
 select @@global.max_connect_errors into @saved_max_connect_errors;
-set global max_connect_errors = 2;
+set global max_connect_errors = 3;
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
+create user 'quota'@'santa.claus.ipv4.example.com';
+grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
@@ -32,7 +34,7 @@ select current_user();
 current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
@@ -61,7 +63,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
@@ -90,7 +92,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
@@ -178,7 +180,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 flush hosts;
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
@@ -207,7 +209,215 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	2
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	2
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+set global debug= "-d,native_password_bad_reply";
+message
+Valid connection should reset SUM_CONNECT_ERROR counter
+set global debug= "+d,native_password_bad_reply";
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	0
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	2
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	1
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	3
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	2
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	4
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	3
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	5
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	3
+COUNT_HOST_BLOCKED_ERRORS	1
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	5
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+"Dumping performance_schema.host_cache"
+IP	192.0.2.4
+HOST	santa.claus.ipv4.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	3
+COUNT_HOST_BLOCKED_ERRORS	2
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	5
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
+revoke select on test.* from 'quota'@'santa.claus.ipv4.example.com';
+drop user 'quota'@'santa.claus.ipv4.example.com';
 set global max_connect_errors = @saved_max_connect_errors;
 set global debug= default;

mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result

@@ -23,8 +23,10 @@ User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
 select @@global.max_connect_errors into @saved_max_connect_errors;
-set global max_connect_errors = 2;
+set global max_connect_errors = 3;
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
+create user 'quota'@'santa.claus.ipv6.example.com';
+grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
@@ -32,7 +34,7 @@ select current_user();
 current_user()
 root@localhost
 set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
@@ -61,7 +63,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
@@ -90,7 +92,7 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
@@ -178,7 +180,7 @@ COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 flush hosts;
-ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
+ERROR 08S01: Bad handshake
 "Dumping performance_schema.host_cache"
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
@@ -207,7 +209,215 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	2
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	2
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+set global debug= "-d,native_password_bad_reply";
+message
+Valid connection should reset SUM_CONNECT_ERROR counter
+set global debug= "+d,native_password_bad_reply";
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	0
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	2
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	1
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	3
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	2
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	4
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR 08S01: Bad handshake
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	3
+COUNT_HOST_BLOCKED_ERRORS	0
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	5
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	3
+COUNT_HOST_BLOCKED_ERRORS	1
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	5
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+"Dumping performance_schema.host_cache"
+IP	2001:db8::6:6
+HOST	santa.claus.ipv6.example.com
+HOST_VALIDATED	YES
+SUM_CONNECT_ERRORS	3
+COUNT_HOST_BLOCKED_ERRORS	2
+COUNT_NAMEINFO_TRANSIENT_ERRORS	0
+COUNT_NAMEINFO_PERMANENT_ERRORS	0
+COUNT_FORMAT_ERRORS	0
+COUNT_ADDRINFO_TRANSIENT_ERRORS	0
+COUNT_ADDRINFO_PERMANENT_ERRORS	0
+COUNT_FCRDNS_ERRORS	0
+COUNT_HOST_ACL_ERRORS	0
+COUNT_NO_AUTH_PLUGIN_ERRORS	0
+COUNT_AUTH_PLUGIN_ERRORS	0
+COUNT_HANDSHAKE_ERRORS	5
+COUNT_PROXY_USER_ERRORS	0
+COUNT_PROXY_USER_ACL_ERRORS	0
+COUNT_AUTHENTICATION_ERRORS	0
+COUNT_SSL_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_ERRORS	0
+COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	0
+COUNT_DEFAULT_DATABASE_ERRORS	0
+COUNT_INIT_CONNECT_ERRORS	0
+COUNT_LOCAL_ERRORS	0
+COUNT_UNKNOWN_ERRORS	0
+FIRST_ERROR_SEEN	set
+LAST_ERROR_SEEN	set
 revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
 drop user 'root'@'santa.claus.ipv6.example.com';
+revoke select on test.* from 'quota'@'santa.claus.ipv6.example.com';
+drop user 'quota'@'santa.claus.ipv6.example.com';
 set global max_connect_errors = @saved_max_connect_errors;
 set global debug= default;

mysql-test/suite/perfschema/r/innodb_table_io.result

@@ -106,9 +106,6 @@ wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
 wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
 wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
 wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
 wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
 wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
 wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL

mysql-test/suite/perfschema/r/myisam_file_io.result

@@ -4,6 +4,7 @@ update performance_schema.setup_instruments set enabled='YES'
 update performance_schema.setup_consumers
 set enabled='YES';
 truncate table performance_schema.events_waits_history_long;
+truncate table performance_schema.events_statements_summary_by_digest;
 flush status;
 drop table if exists test.no_index_tab;
 create table test.no_index_tab ( a varchar(255), b int ) engine=myisam;

mysql-test/suite/perfschema/r/ortho_iter.result

@@ -28,7 +28,8 @@ select (instr_name like "statement/%") into is_statement;
 select instr_name, is_wait, is_stage, is_statement;
 select count(name)
 from performance_schema.setup_instruments
-where name like (concat(instr_name, "%"))
+where (name like (concat(instr_name, "%")))
+and (not name like "%/abstract/%")
 into count_expected;
 set cmd_1= "select count(*) from (select distinct event_name from performance_schema.";
 set cmd_2= concat(" where event_name like \"",
@@ -110,12 +111,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
@@ -639,6 +640,41 @@ status
 Checking table events_waits_summary_global_by_event_name ...
 Warnings:
 Warning	12000	Done
+call check_instrument("statement/abstract/");
+instr_name	is_wait	is_stage	is_statement
+statement/abstract/	0	0	1
+status
+Checking table events_stages_summary_by_account_by_event_name ...
+status
+Checking table events_stages_summary_by_host_by_event_name ...
+status
+Checking table events_stages_summary_by_thread_by_event_name ...
+status
+Checking table events_stages_summary_by_user_by_event_name ...
+status
+Checking table events_stages_summary_global_by_event_name ...
+status
+Checking table events_statements_summary_by_account_by_event_name ...
+status
+Checking table events_statements_summary_by_host_by_event_name ...
+status
+Checking table events_statements_summary_by_thread_by_event_name ...
+status
+Checking table events_statements_summary_by_user_by_event_name ...
+status
+Checking table events_statements_summary_global_by_event_name ...
+status
+Checking table events_waits_summary_by_account_by_event_name ...
+status
+Checking table events_waits_summary_by_host_by_event_name ...
+status
+Checking table events_waits_summary_by_thread_by_event_name ...
+status
+Checking table events_waits_summary_by_user_by_event_name ...
+status
+Checking table events_waits_summary_global_by_event_name ...
+Warnings:
+Warning	12000	Done
 call check_instrument("statement/");
 instr_name	is_wait	is_stage	is_statement
 statement/	0	0	1

mysql-test/suite/perfschema/r/pfs_upgrade_event.result

@@ -6,59 +6,59 @@ update mysql.event set db='performance_schema' where name='user_event';
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 156: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 206: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 231: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 244: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 257: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 270: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 284: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 297: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 309: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 347: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 378: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 391: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 421: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 450: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 485: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 494: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 508: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 518: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 528: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 537: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 545: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 554: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 565: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 573: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 618: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 662: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 741: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 761: Table 'threads' already exists
-ERROR 1050 (42S01) at line 777: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 822: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 835: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 848: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 874: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 920: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 966: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1012: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1044: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1076: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1108: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1141: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1181: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1190: Table 'users' already exists
-ERROR 1050 (42S01) at line 1200: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1235: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1245: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1251: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1844: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 769: Table 'threads' already exists
+ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1198: Table 'users' already exists
+ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists
+ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists
+ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists
+ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists
+ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

mysql-test/suite/perfschema/r/pfs_upgrade_func.result

@@ -6,59 +6,59 @@ update mysql.proc set db='performance_schema' where name='user_func';
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 156: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 206: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 231: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 244: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 257: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 270: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 284: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 297: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 309: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 347: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 378: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 391: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 421: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 450: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 485: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 494: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 508: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 518: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 528: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 537: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 545: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 554: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 565: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 573: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 618: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 662: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 741: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 761: Table 'threads' already exists
-ERROR 1050 (42S01) at line 777: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 822: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 835: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 848: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 874: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 920: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 966: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1012: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1044: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1076: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1108: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1141: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1181: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1190: Table 'users' already exists
-ERROR 1050 (42S01) at line 1200: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1235: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1245: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1251: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1844: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 769: Table 'threads' already exists
+ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1198: Table 'users' already exists
+ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists
+ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists
+ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists
+ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists
+ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name

mysql-test/suite/perfschema/r/pfs_upgrade_proc.result

@@ -6,59 +6,59 @@ update mysql.proc set db='performance_schema' where name='user_proc';
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 156: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 206: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 231: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 244: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 257: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 270: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 284: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 297: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 309: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 347: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 378: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 391: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 421: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 450: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 485: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 494: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 508: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 518: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 528: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 537: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 545: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 554: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 565: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 573: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 618: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 662: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 741: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 761: Table 'threads' already exists
-ERROR 1050 (42S01) at line 777: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 822: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 835: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 848: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 874: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 920: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 966: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1012: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1044: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1076: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1108: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1141: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1181: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1190: Table 'users' already exists
-ERROR 1050 (42S01) at line 1200: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1235: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1245: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1251: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1844: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 769: Table 'threads' already exists
+ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1198: Table 'users' already exists
+ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists
+ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists
+ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists
+ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists
+ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name

mysql-test/suite/perfschema/r/pfs_upgrade_table.result

@@ -8,59 +8,59 @@ user_table
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 156: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 206: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 231: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 244: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 257: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 270: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 284: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 297: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 309: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 347: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 378: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 391: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 421: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 450: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 485: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 494: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 508: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 518: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 528: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 537: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 545: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 554: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 565: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 573: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 618: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 662: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 741: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 761: Table 'threads' already exists
-ERROR 1050 (42S01) at line 777: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 822: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 835: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 848: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 874: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 920: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 966: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1012: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1044: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1076: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1108: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1141: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1181: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1190: Table 'users' already exists
-ERROR 1050 (42S01) at line 1200: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1235: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1245: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1251: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1844: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 769: Table 'threads' already exists
+ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1198: Table 'users' already exists
+ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists
+ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists
+ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists
+ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists
+ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)

mysql-test/suite/perfschema/r/pfs_upgrade_view.result

@@ -8,59 +8,59 @@ user_view
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
 Warning: Using a password on the command line interface can be insecure.
-ERROR 1050 (42S01) at line 156: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 181: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 206: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 231: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 244: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 257: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 270: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 284: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 297: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 309: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 318: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 347: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 378: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 391: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 421: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 450: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 485: Table 'host_cache' already exists
-ERROR 1050 (42S01) at line 494: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 508: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 518: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 528: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 537: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 545: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 554: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 565: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 573: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 618: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 662: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 741: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 761: Table 'threads' already exists
-ERROR 1050 (42S01) at line 777: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 793: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 809: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 822: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 835: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 848: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 862: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 874: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 920: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 966: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 1012: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 1044: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 1076: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 1108: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 1141: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1181: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1190: Table 'users' already exists
-ERROR 1050 (42S01) at line 1200: Table 'accounts' already exists
-ERROR 1050 (42S01) at line 1235: Table 'events_statements_summary_by_digest' already exists
-ERROR 1050 (42S01) at line 1245: Table 'session_connect_attrs' already exists
-ERROR 1050 (42S01) at line 1251: Table 'session_account_connect_attrs' already exists
-ERROR 1644 (HY000) at line 1844: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 164: Table 'cond_instances' already exists
+ERROR 1050 (42S01) at line 189: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 214: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 239: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 252: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 265: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 278: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 292: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 305: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 317: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 326: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 355: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 386: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 399: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 429: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 458: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 493: Table 'host_cache' already exists
+ERROR 1050 (42S01) at line 502: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 516: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 526: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 536: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 545: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 553: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 562: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 573: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 581: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 626: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 670: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 749: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 769: Table 'threads' already exists
+ERROR 1050 (42S01) at line 785: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 801: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 817: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 843: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 856: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 870: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 882: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 928: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 974: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 1020: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 1052: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 1084: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 1116: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1149: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1180: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1189: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1198: Table 'users' already exists
+ERROR 1050 (42S01) at line 1208: Table 'accounts' already exists
+ERROR 1050 (42S01) at line 1243: Table 'events_statements_summary_by_digest' already exists
+ERROR 1050 (42S01) at line 1253: Table 'session_connect_attrs' already exists
+ERROR 1050 (42S01) at line 1259: Table 'session_account_connect_attrs' already exists
+ERROR 1644 (HY000) at line 1852: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)

mysql-test/suite/perfschema/r/privilege_table_io.result

@@ -41,12 +41,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/relaylog.result

 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists test.t1;
 reset master;
@@ -69,6 +69,7 @@ wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_log	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue	MANY
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xids	NONE
 "Expect no slave relay log"
 select * from performance_schema.file_summary_by_instance
 where event_name like "%relaylog%" order by file_name;
@@ -93,6 +94,7 @@ wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index	0	0	0	0	0
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_log	0	0	0	0	0
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync	0	0	0	0	0
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync_queue	0	0	0	0	0
+wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_xids	0	0	0	0	0
 "============ Performance schema on slave ============"
 select * from performance_schema.file_summary_by_instance
 where file_name like "%master-%" order by file_name;
@@ -159,6 +161,7 @@ wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_log	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_sync_queue	MANY
+wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xids	NONE
 "Expect a slave relay log"
 select
 substring(file_name, locate("slave-", file_name)) as FILE_NAME,
@@ -203,6 +206,7 @@ wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_done	NONE
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_flush_queue	NONE
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_log	MANY
-wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync	MANY
+wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync	NONE
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_sync_queue	NONE
+wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_xids	MANY
 include/rpl_end.inc

mysql-test/suite/perfschema/r/rpl_gtid_func.result

 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 **** On Master ****
 drop table if exists test.marker;

mysql-test/suite/perfschema/r/setup_instruments_defaults.result

+#
+# Verify that the configuration file defaults were processed correctly
+#
 SELECT * FROM performance_schema.setup_instruments
 WHERE name IN (
 'wait/synch/mutex/sql/LOCK_user_conn',
 'wait/synch/mutex/sql/LOCK_uuid_generator',
-'wait/synch/mutex/sql/LOCK_xid_cache'
-  'stage/sql/creating table')
+'wait/synch/mutex/sql/LOCK_xid_cache',
+'stage/sql/creating table')
 AND enabled = 'yes' AND timed = 'no'
 ORDER BY name;
 NAME	ENABLED	TIMED
+stage/sql/creating table	YES	NO
 wait/synch/mutex/sql/LOCK_user_conn	YES	NO
 wait/synch/mutex/sql/LOCK_uuid_generator	YES	NO
+wait/synch/mutex/sql/LOCK_xid_cache	YES	NO
 SELECT * FROM performance_schema.setup_instruments
 WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count'
 AND enabled = 'no' AND timed = 'no';
@@ -24,13 +29,36 @@ NAME	ENABLED	TIMED
 wait/synch/mutex/sql/LOG_INFO::lock	YES	YES
 wait/synch/mutex/sql/THD::LOCK_thd_data	YES	YES
 SELECT * FROM performance_schema.setup_instruments
-WHERE name IN (
-'wait/synch/mutex/sql/Delayed_insert::mutex',
-'wait/synch/mutex/sql/hash_filo::lock')
+WHERE name = 'wait/synch/mutex/sql/hash_filo::lock'
 AND enabled = 'no' AND timed = 'no'
 ORDER BY name;
 NAME	ENABLED	TIMED
-wait/synch/mutex/sql/Delayed_insert::mutex	NO	NO
 wait/synch/mutex/sql/hash_filo::lock	NO	NO
+#
+# Verify that the instrument startup settings are not not visible.
+#
 SHOW VARIABLES LIKE "%/wait/synch/mutex%";
 Variable_name	Value
+#
+# Verify command line options are processed correctly
+#
+#
+# Verify that wait/io/table/sql/handler is enabled and timed
+#
+SELECT * FROM performance_schema.setup_instruments
+WHERE name like "%wait/io/table/sql/handler%";
+NAME	ENABLED	TIMED
+wait/io/table/sql/handler	YES	YES
+#
+# Stop server
+# Restart server with wait/io/table/sql/handler disabled
+# Enable reconnect
+# Wait until connected again
+# Disable reconnect
+#
+# Verify that wait/io/table is disabled
+#
+SELECT * FROM performance_schema.setup_instruments
+WHERE name like "%wait/io/table/sql/handler%";
+NAME	ENABLED	TIMED
+wait/io/table/sql/handler	NO	NO

mysql-test/suite/perfschema/r/sizing_high.result

@@ -26,12 +26,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	23385
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	52200
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	30800
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	420
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	800
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
@@ -79,8 +79,8 @@ performance_schema	(pfs_mutex_class).row_size	256
 performance_schema	(pfs_mutex_class).row_count	200
 performance_schema	(pfs_mutex_class).memory	51200
 performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	30
-performance_schema	(pfs_rwlock_class).memory	9600
+performance_schema	(pfs_rwlock_class).row_count	40
+performance_schema	(pfs_rwlock_class).memory	12800
 performance_schema	(pfs_cond_class).row_size	256
 performance_schema	(pfs_cond_class).row_count	80
 performance_schema	(pfs_cond_class).memory	20480
@@ -99,9 +99,9 @@ performance_schema	rwlock_instances.memory	5913600
 performance_schema	cond_instances.row_size	128
 performance_schema	cond_instances.row_count	10900
 performance_schema	cond_instances.memory	1395200
-performance_schema	threads.row_size	1856
+performance_schema	threads.row_size	2816
 performance_schema	threads.row_count	500
-performance_schema	threads.memory	928000
+performance_schema	threads.memory	1408000
 performance_schema	file_instances.row_size	704
 performance_schema	file_instances.row_count	23385
 performance_schema	file_instances.memory	16463040
@@ -109,8 +109,8 @@ performance_schema	(pfs_file_handle).row_size	8
 performance_schema	(pfs_file_handle).row_count	32768
 performance_schema	(pfs_file_handle).memory	262144
 performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	186500
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	5968000
+performance_schema	events_waits_summary_by_thread_by_event_name.row_count	191500
+performance_schema	events_waits_summary_by_thread_by_event_name.memory	6128000
 performance_schema	(pfs_table_share).row_size	22208
 performance_schema	(pfs_table_share).row_count	12500
 performance_schema	(pfs_table_share).memory	277600000
@@ -127,23 +127,23 @@ performance_schema	(pfs_account).row_size	256
 performance_schema	(pfs_account).row_count	100
 performance_schema	(pfs_account).memory	25600
 performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	37300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1193600
+performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
+performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
 performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	37300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1193600
+performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
+performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
 performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	37300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1193600
+performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
+performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
 performance_schema	(pfs_user).row_size	128
 performance_schema	(pfs_user).row_count	100
 performance_schema	(pfs_user).memory	12800
 performance_schema	(pfs_host).row_size	128
 performance_schema	(pfs_host).row_count	100
 performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	192
+performance_schema	(pfs_stage_class).row_size	256
 performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	28800
+performance_schema	(pfs_stage_class).memory	38400
 performance_schema	events_stages_history.row_size	88
 performance_schema	events_stages_history.row_count	5000
 performance_schema	events_stages_history.memory	440000
@@ -166,8 +166,8 @@ performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
 performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
 performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
 performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	167
-performance_schema	(pfs_statement_class).memory	32064
+performance_schema	(pfs_statement_class).row_count	168
+performance_schema	(pfs_statement_class).memory	32256
 performance_schema	events_statements_history.row_size	3024
 performance_schema	events_statements_history.row_count	5000
 performance_schema	events_statements_history.memory	15120000
@@ -175,20 +175,20 @@ performance_schema	events_statements_history_long.row_size	3024
 performance_schema	events_statements_history_long.row_count	10000
 performance_schema	events_statements_history_long.memory	30240000
 performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	83500
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	15364000
+performance_schema	events_statements_summary_by_thread_by_event_name.row_count	84000
+performance_schema	events_statements_summary_by_thread_by_event_name.memory	15456000
 performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	167
-performance_schema	events_statements_summary_global_by_event_name.memory	30728
+performance_schema	events_statements_summary_global_by_event_name.row_count	168
+performance_schema	events_statements_summary_global_by_event_name.memory	30912
 performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16700
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3072800
+performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
+performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
 performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16700
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3072800
+performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
+performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
 performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16700
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3072800
+performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
+performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
 performance_schema	events_statements_current.row_size	3024
 performance_schema	events_statements_current.row_count	500
 performance_schema	events_statements_current.memory	1512000
@@ -216,9 +216,9 @@ performance_schema	(setup_actor_hash).count	1
 performance_schema	(setup_actor_hash).size	100
 performance_schema	(setup_object_hash).count	4
 performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	82
+performance_schema	(table_share_hash).count	80
 performance_schema	(table_share_hash).size	12500
 performance_schema	(user_hash).count	2
 performance_schema	(user_hash).size	100
 performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	421029256
+performance_schema	performance_schema.memory	421925632

mysql-test/suite/perfschema/r/sizing_low.result

@@ -26,12 +26,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	1556
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	2945
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	1612
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	67
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	112
 performance_schema_max_table_instances	445
 performance_schema_max_thread_classes	50
@@ -79,8 +79,8 @@ performance_schema	(pfs_mutex_class).row_size	256
 performance_schema	(pfs_mutex_class).row_count	200
 performance_schema	(pfs_mutex_class).memory	51200
 performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	30
-performance_schema	(pfs_rwlock_class).memory	9600
+performance_schema	(pfs_rwlock_class).row_count	40
+performance_schema	(pfs_rwlock_class).memory	12800
 performance_schema	(pfs_cond_class).row_size	256
 performance_schema	(pfs_cond_class).row_count	80
 performance_schema	(pfs_cond_class).memory	20480
@@ -99,9 +99,9 @@ performance_schema	rwlock_instances.memory	309504
 performance_schema	cond_instances.row_size	128
 performance_schema	cond_instances.row_count	612
 performance_schema	cond_instances.memory	78336
-performance_schema	threads.row_size	1856
+performance_schema	threads.row_size	2816
 performance_schema	threads.row_count	112
-performance_schema	threads.memory	207872
+performance_schema	threads.memory	315392
 performance_schema	file_instances.row_size	704
 performance_schema	file_instances.row_count	1556
 performance_schema	file_instances.memory	1095424
@@ -109,8 +109,8 @@ performance_schema	(pfs_file_handle).row_size	8
 performance_schema	(pfs_file_handle).row_count	32768
 performance_schema	(pfs_file_handle).memory	262144
 performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	41776
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	1336832
+performance_schema	events_waits_summary_by_thread_by_event_name.row_count	42896
+performance_schema	events_waits_summary_by_thread_by_event_name.memory	1372672
 performance_schema	(pfs_table_share).row_size	22208
 performance_schema	(pfs_table_share).row_count	445
 performance_schema	(pfs_table_share).memory	9882560
@@ -127,23 +127,23 @@ performance_schema	(pfs_account).row_size	256
 performance_schema	(pfs_account).row_count	10
 performance_schema	(pfs_account).memory	2560
 performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	3730
-performance_schema	events_waits_summary_by_account_by_event_name.memory	119360
+performance_schema	events_waits_summary_by_account_by_event_name.row_count	3830
+performance_schema	events_waits_summary_by_account_by_event_name.memory	122560
 performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	1865
-performance_schema	events_waits_summary_by_user_by_event_name.memory	59680
+performance_schema	events_waits_summary_by_user_by_event_name.row_count	1915
+performance_schema	events_waits_summary_by_user_by_event_name.memory	61280
 performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	7460
-performance_schema	events_waits_summary_by_host_by_event_name.memory	238720
+performance_schema	events_waits_summary_by_host_by_event_name.row_count	7660
+performance_schema	events_waits_summary_by_host_by_event_name.memory	245120
 performance_schema	(pfs_user).row_size	128
 performance_schema	(pfs_user).row_count	5
 performance_schema	(pfs_user).memory	640
 performance_schema	(pfs_host).row_size	128
 performance_schema	(pfs_host).row_count	20
 performance_schema	(pfs_host).memory	2560
-performance_schema	(pfs_stage_class).row_size	192
+performance_schema	(pfs_stage_class).row_size	256
 performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	28800
+performance_schema	(pfs_stage_class).memory	38400
 performance_schema	events_stages_history.row_size	88
 performance_schema	events_stages_history.row_count	560
 performance_schema	events_stages_history.memory	49280
@@ -166,8 +166,8 @@ performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
 performance_schema	events_stages_summary_by_host_by_event_name.row_count	3000
 performance_schema	events_stages_summary_by_host_by_event_name.memory	96000
 performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	167
-performance_schema	(pfs_statement_class).memory	32064
+performance_schema	(pfs_statement_class).row_count	168
+performance_schema	(pfs_statement_class).memory	32256
 performance_schema	events_statements_history.row_size	3024
 performance_schema	events_statements_history.row_count	560
 performance_schema	events_statements_history.memory	1693440
@@ -175,20 +175,20 @@ performance_schema	events_statements_history_long.row_size	3024
 performance_schema	events_statements_history_long.row_count	100
 performance_schema	events_statements_history_long.memory	302400
 performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	18704
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	3441536
+performance_schema	events_statements_summary_by_thread_by_event_name.row_count	18816
+performance_schema	events_statements_summary_by_thread_by_event_name.memory	3462144
 performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	167
-performance_schema	events_statements_summary_global_by_event_name.memory	30728
+performance_schema	events_statements_summary_global_by_event_name.row_count	168
+performance_schema	events_statements_summary_global_by_event_name.memory	30912
 performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	1670
-performance_schema	events_statements_summary_by_account_by_event_name.memory	307280
+performance_schema	events_statements_summary_by_account_by_event_name.row_count	1680
+performance_schema	events_statements_summary_by_account_by_event_name.memory	309120
 performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	835
-performance_schema	events_statements_summary_by_user_by_event_name.memory	153640
+performance_schema	events_statements_summary_by_user_by_event_name.row_count	840
+performance_schema	events_statements_summary_by_user_by_event_name.memory	154560
 performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	3340
-performance_schema	events_statements_summary_by_host_by_event_name.memory	614560
+performance_schema	events_statements_summary_by_host_by_event_name.row_count	3360
+performance_schema	events_statements_summary_by_host_by_event_name.memory	618240
 performance_schema	events_statements_current.row_size	3024
 performance_schema	events_statements_current.row_count	112
 performance_schema	events_statements_current.memory	338688
@@ -216,9 +216,9 @@ performance_schema	(setup_actor_hash).count	1
 performance_schema	(setup_actor_hash).size	100
 performance_schema	(setup_object_hash).count	4
 performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	82
+performance_schema	(table_share_hash).count	80
 performance_schema	(table_share_hash).size	445
 performance_schema	(user_hash).count	2
 performance_schema	(user_hash).size	5
 performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	24576832
+performance_schema	performance_schema.memory	24771616

mysql-test/suite/perfschema/r/sizing_med.result

@@ -26,12 +26,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	1754
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	4230
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	2222
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	232
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	573
 performance_schema_max_table_instances	556
 performance_schema_max_thread_classes	50
@@ -79,8 +79,8 @@ performance_schema	(pfs_mutex_class).row_size	256
 performance_schema	(pfs_mutex_class).row_count	200
 performance_schema	(pfs_mutex_class).memory	51200
 performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	30
-performance_schema	(pfs_rwlock_class).memory	9600
+performance_schema	(pfs_rwlock_class).row_count	40
+performance_schema	(pfs_rwlock_class).memory	12800
 performance_schema	(pfs_cond_class).row_size	256
 performance_schema	(pfs_cond_class).row_count	80
 performance_schema	(pfs_cond_class).memory	20480
@@ -99,9 +99,9 @@ performance_schema	rwlock_instances.memory	426624
 performance_schema	cond_instances.row_size	128
 performance_schema	cond_instances.row_count	1079
 performance_schema	cond_instances.memory	138112
-performance_schema	threads.row_size	1856
+performance_schema	threads.row_size	2816
 performance_schema	threads.row_count	289
-performance_schema	threads.memory	536384
+performance_schema	threads.memory	813824
 performance_schema	file_instances.row_size	704
 performance_schema	file_instances.row_count	1754
 performance_schema	file_instances.memory	1234816
@@ -109,8 +109,8 @@ performance_schema	(pfs_file_handle).row_size	8
 performance_schema	(pfs_file_handle).row_count	32768
 performance_schema	(pfs_file_handle).memory	262144
 performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	107797
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	3449504
+performance_schema	events_waits_summary_by_thread_by_event_name.row_count	110687
+performance_schema	events_waits_summary_by_thread_by_event_name.memory	3541984
 performance_schema	(pfs_table_share).row_size	22208
 performance_schema	(pfs_table_share).row_count	556
 performance_schema	(pfs_table_share).memory	12347648
@@ -127,23 +127,23 @@ performance_schema	(pfs_account).row_size	256
 performance_schema	(pfs_account).row_count	100
 performance_schema	(pfs_account).memory	25600
 performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	37300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1193600
+performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
+performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
 performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	37300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1193600
+performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
+performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
 performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	37300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1193600
+performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
+performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
 performance_schema	(pfs_user).row_size	128
 performance_schema	(pfs_user).row_count	100
 performance_schema	(pfs_user).memory	12800
 performance_schema	(pfs_host).row_size	128
 performance_schema	(pfs_host).row_count	100
 performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	192
+performance_schema	(pfs_stage_class).row_size	256
 performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	28800
+performance_schema	(pfs_stage_class).memory	38400
 performance_schema	events_stages_history.row_size	88
 performance_schema	events_stages_history.row_count	2890
 performance_schema	events_stages_history.memory	254320
@@ -166,8 +166,8 @@ performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
 performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
 performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
 performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	167
-performance_schema	(pfs_statement_class).memory	32064
+performance_schema	(pfs_statement_class).row_count	168
+performance_schema	(pfs_statement_class).memory	32256
 performance_schema	events_statements_history.row_size	3024
 performance_schema	events_statements_history.row_count	2890
 performance_schema	events_statements_history.memory	8739360
@@ -175,20 +175,20 @@ performance_schema	events_statements_history_long.row_size	3024
 performance_schema	events_statements_history_long.row_count	1000
 performance_schema	events_statements_history_long.memory	3024000
 performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	48263
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	8880392
+performance_schema	events_statements_summary_by_thread_by_event_name.row_count	48552
+performance_schema	events_statements_summary_by_thread_by_event_name.memory	8933568
 performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	167
-performance_schema	events_statements_summary_global_by_event_name.memory	30728
+performance_schema	events_statements_summary_global_by_event_name.row_count	168
+performance_schema	events_statements_summary_global_by_event_name.memory	30912
 performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16700
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3072800
+performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
+performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
 performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16700
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3072800
+performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
+performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
 performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16700
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3072800
+performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
+performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
 performance_schema	events_statements_current.row_size	3024
 performance_schema	events_statements_current.row_count	289
 performance_schema	events_statements_current.memory	873936
@@ -216,9 +216,9 @@ performance_schema	(setup_actor_hash).count	1
 performance_schema	(setup_actor_hash).size	100
 performance_schema	(setup_object_hash).count	4
 performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	82
+performance_schema	(table_share_hash).count	80
 performance_schema	(table_share_hash).size	556
 performance_schema	(user_hash).count	2
 performance_schema	(user_hash).size	100
 performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	70366560
+performance_schema	performance_schema.memory	70954032

mysql-test/suite/perfschema/r/sizing_off.result

@@ -17,12 +17,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	-1
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	-1
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	-1
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	-1
 performance_schema_max_table_instances	-1
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_disable_idle.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_disable_stages.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_disable_statements.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_disable_waits.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_innodb.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_account.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_cond_class.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_cond_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_file_class.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_file_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	0
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_host.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_mutex_class.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	0
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	0
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result

@@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	0
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
@@ -106,7 +106,7 @@ show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_rwlock_classes";
 Variable_name	Value
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/rwlock/%";
 count(*) > 0

mysql-test/suite/perfschema/r/start_server_no_setup_actors.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_setup_objects.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_socket_class.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	0
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_socket_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	0
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_stage_class.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_stages_history.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_statement_class.result

@@ -88,7 +88,7 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000

mysql-test/suite/perfschema/r/start_server_no_statements_history.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_table_hdl.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_table_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_thread_class.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	0

mysql-test/suite/perfschema/r/start_server_no_thread_inst.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_user.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_waits_history.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_off.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/start_server_on.result

@@ -88,12 +88,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result

@@ -56,12 +56,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result

@@ -55,12 +55,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result

@@ -56,12 +56,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result

@@ -55,12 +55,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_off.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result

@@ -60,12 +60,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result

@@ -59,12 +59,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result

@@ -60,12 +60,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result

@@ -59,12 +59,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result

@@ -60,12 +60,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result

@@ -59,12 +59,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result

@@ -60,12 +60,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result

@@ -59,12 +59,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result

@@ -60,12 +60,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result

@@ -59,12 +59,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result

@@ -60,12 +60,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result

@@ -59,12 +59,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result

@@ -58,12 +58,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50

mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result

@@ -57,12 +57,12 @@ performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	30
+performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	167
+performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50