summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/perfschema')
-rw-r--r--mysql-test/suite/perfschema/r/dml_handler.result98
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate.result595
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a.result451
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result395
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result291
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result235
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_h.result539
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_u.result435
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result379
-rw-r--r--mysql-test/suite/perfschema/r/func_mutex.result44
-rw-r--r--mysql-test/suite/perfschema/r/misc.result4
-rw-r--r--mysql-test/suite/perfschema/r/nesting.result259
-rw-r--r--mysql-test/suite/perfschema/r/privilege.result32
-rw-r--r--mysql-test/suite/perfschema/t/func_mutex.test18
-rw-r--r--mysql-test/suite/perfschema/t/misc.test4
15 files changed, 1760 insertions, 2019 deletions
diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result
index 707a1d7071a..41ffa18799f 100644
--- a/mysql-test/suite/perfschema/r/dml_handler.result
+++ b/mysql-test/suite/perfschema/r/dml_handler.result
@@ -11,149 +11,149 @@ SELECT COUNT(*) FROM table_list INTO @table_count;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
HANDLER performance_schema.users OPEN;
-ERROR HY000: Table storage engine for 'users' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`users` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
HANDLER performance_schema.threads OPEN;
-ERROR HY000: Table storage engine for 'threads' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`threads` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
-ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_lock_waits_summary_by_table` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
-ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_table` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
-ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_index_usage` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
HANDLER performance_schema.socket_summary_by_instance OPEN;
-ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
HANDLER performance_schema.socket_summary_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
HANDLER performance_schema.socket_instances OPEN;
-ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
HANDLER performance_schema.setup_timers OPEN;
-ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_timers` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
HANDLER performance_schema.setup_objects OPEN;
-ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_objects` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
HANDLER performance_schema.setup_instruments OPEN;
-ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_instruments` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
HANDLER performance_schema.setup_consumers OPEN;
-ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_consumers` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
HANDLER performance_schema.setup_actors OPEN;
-ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_actors` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
HANDLER performance_schema.rwlock_instances OPEN;
-ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`rwlock_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
HANDLER performance_schema.performance_timers OPEN;
-ERROR HY000: Table storage engine for 'performance_timers' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`performance_timers` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
HANDLER performance_schema.objects_summary_global_by_type OPEN;
-ERROR HY000: Table storage engine for 'objects_summary_global_by_type' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`objects_summary_global_by_type` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
HANDLER performance_schema.mutex_instances OPEN;
-ERROR HY000: Table storage engine for 'mutex_instances' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
HANDLER performance_schema.hosts OPEN;
-ERROR HY000: Table storage engine for 'hosts' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
HANDLER performance_schema.file_summary_by_instance OPEN;
-ERROR HY000: Table storage engine for 'file_summary_by_instance' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30;
HANDLER performance_schema.file_summary_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'file_summary_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29;
HANDLER performance_schema.file_instances OPEN;
-ERROR HY000: Table storage engine for 'file_instances' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28;
HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_global_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27;
HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_user_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26;
HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_thread_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25;
HANDLER performance_schema.events_waits_summary_by_instance OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_instance' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24;
HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_host_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23;
HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_account_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22;
HANDLER performance_schema.events_waits_history_long OPEN;
-ERROR HY000: Table storage engine for 'events_waits_history_long' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21;
HANDLER performance_schema.events_waits_history OPEN;
-ERROR HY000: Table storage engine for 'events_waits_history' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20;
HANDLER performance_schema.events_waits_current OPEN;
-ERROR HY000: Table storage engine for 'events_waits_current' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19;
HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_global_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18;
HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_user_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17;
HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_thread_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=16;
HANDLER performance_schema.events_statements_summary_by_host_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_host_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=15;
HANDLER performance_schema.events_statements_summary_by_digest OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_digest' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_digest` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=14;
HANDLER performance_schema.events_statements_summary_by_account_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_account_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=13;
HANDLER performance_schema.events_statements_history_long OPEN;
-ERROR HY000: Table storage engine for 'events_statements_history_long' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_history_long` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=12;
HANDLER performance_schema.events_statements_history OPEN;
-ERROR HY000: Table storage engine for 'events_statements_history' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_history` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=11;
HANDLER performance_schema.events_statements_current OPEN;
-ERROR HY000: Table storage engine for 'events_statements_current' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_current` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=10;
HANDLER performance_schema.events_stages_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_stages_summary_global_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=9;
HANDLER performance_schema.events_stages_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_stages_summary_by_user_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=8;
HANDLER performance_schema.events_stages_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_stages_summary_by_thread_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=7;
HANDLER performance_schema.events_stages_summary_by_host_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_stages_summary_by_host_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=6;
HANDLER performance_schema.events_stages_summary_by_account_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_stages_summary_by_account_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=5;
HANDLER performance_schema.events_stages_history_long OPEN;
-ERROR HY000: Table storage engine for 'events_stages_history_long' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_history_long` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=4;
HANDLER performance_schema.events_stages_history OPEN;
-ERROR HY000: Table storage engine for 'events_stages_history' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_history` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=3;
HANDLER performance_schema.events_stages_current OPEN;
-ERROR HY000: Table storage engine for 'events_stages_current' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_stages_current` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=2;
HANDLER performance_schema.cond_instances OPEN;
-ERROR HY000: Table storage engine for 'cond_instances' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`cond_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=1;
HANDLER performance_schema.accounts OPEN;
-ERROR HY000: Table storage engine for 'accounts' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`accounts` doesn't have this option
DROP TEMPORARY TABLE table_list;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result
index 6863ac6e2ce..a5cfe97f98e 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate.result
@@ -188,8 +188,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -200,31 +200,30 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -300,8 +299,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -315,8 +314,8 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -325,8 +324,8 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -335,19 +334,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -448,13 +446,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -463,39 +461,38 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -589,13 +586,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -607,12 +604,12 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -621,12 +618,12 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -635,19 +632,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -766,65 +762,64 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -936,18 +931,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -957,16 +952,16 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -975,16 +970,16 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -993,19 +988,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1142,76 +1136,75 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1343,72 +1336,71 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
localhost wait/synch/mutex/sql/LOCK_connection_count 1
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1543,67 +1535,66 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
localhost wait/synch/mutex/sql/LOCK_connection_count 2
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1740,62 +1731,61 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
localhost wait/synch/mutex/sql/LOCK_connection_count 3
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1935,56 +1925,55 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2125,56 +2114,55 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2333,38 +2321,37 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2541,20 +2528,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2737,14 +2723,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2933,8 +2918,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -3123,8 +3107,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -3313,8 +3296,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3503,8 +3485,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3693,8 +3674,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3883,8 +3863,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4073,8 +4052,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4263,8 +4241,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4453,8 +4430,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4643,8 +4619,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4833,8 +4808,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -5007,8 +4981,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -5129,8 +5102,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -5215,8 +5187,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
index ad2440bd2d1..42945079ef4 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -173,8 +173,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -187,25 +187,24 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -271,8 +270,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -288,8 +287,8 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -298,19 +297,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -392,13 +390,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -409,29 +407,28 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -506,13 +503,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -526,12 +523,12 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -540,19 +537,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -643,18 +639,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
@@ -663,33 +659,32 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -773,18 +768,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -796,16 +791,16 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -814,19 +809,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -926,60 +920,59 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1074,56 +1067,55 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
localhost wait/synch/mutex/sql/LOCK_connection_count 1
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1221,51 +1213,50 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
localhost wait/synch/mutex/sql/LOCK_connection_count 2
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1365,46 +1356,45 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
localhost wait/synch/mutex/sql/LOCK_connection_count 3
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1509,38 +1499,37 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1646,38 +1635,37 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1783,38 +1771,37 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1938,20 +1925,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2081,14 +2067,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2224,8 +2209,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2361,8 +2345,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2498,8 +2481,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2635,8 +2617,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2772,8 +2753,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2909,8 +2889,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3046,8 +3025,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3183,8 +3161,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3320,8 +3297,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3457,8 +3433,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3594,8 +3569,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3731,8 +3705,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3852,8 +3825,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3937,8 +3909,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
index 6faff1992c7..12893a8cc2b 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
@@ -147,8 +147,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -161,21 +161,20 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -232,8 +231,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -249,8 +248,8 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -261,13 +260,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -340,13 +338,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -357,25 +355,24 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -441,13 +438,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -461,12 +458,12 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -477,13 +474,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -565,18 +561,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
@@ -585,29 +581,28 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -682,18 +677,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -705,16 +700,16 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -725,13 +720,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -822,56 +816,55 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -957,52 +950,51 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1091,47 +1083,46 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1222,42 +1213,41 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1353,34 +1343,33 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1477,34 +1466,33 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1601,34 +1589,33 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1745,14 +1732,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1869,14 +1855,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1999,8 +1984,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2123,8 +2107,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2247,8 +2230,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2371,8 +2353,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2495,8 +2476,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2619,8 +2599,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2743,8 +2722,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2867,8 +2845,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2991,8 +2968,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3115,8 +3091,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3239,8 +3214,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3363,8 +3337,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3471,8 +3444,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3543,8 +3515,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
index 87b81a54b6b..bd9a52361a1 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
@@ -158,8 +158,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -174,19 +174,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -242,8 +241,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -261,19 +260,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -336,13 +334,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -355,19 +353,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -423,13 +420,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -445,19 +442,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -520,18 +516,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
@@ -542,19 +538,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -610,18 +605,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -635,19 +630,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -710,23 +704,23 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -735,19 +729,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -805,18 +798,18 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -825,20 +818,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
localhost wait/synch/mutex/sql/LOCK_connection_count 1
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -899,13 +891,13 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -914,20 +906,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
localhost wait/synch/mutex/sql/LOCK_connection_count 2
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -990,8 +981,8 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -1000,20 +991,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
localhost wait/synch/mutex/sql/LOCK_connection_count 3
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1083,20 +1073,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1167,20 +1156,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1251,20 +1239,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1335,20 +1322,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1425,14 +1411,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1515,8 +1500,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1599,8 +1583,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1683,8 +1666,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1767,8 +1749,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1851,8 +1832,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1935,8 +1915,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2019,8 +1998,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2103,8 +2081,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2187,8 +2164,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2271,8 +2247,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2355,8 +2330,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2439,8 +2413,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2523,8 +2496,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2607,8 +2579,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
index 09144e3641b..bb14b14e291 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
@@ -132,8 +132,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -150,13 +150,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -203,8 +202,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -224,13 +223,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -284,13 +282,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -305,13 +303,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -358,13 +355,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -382,13 +379,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -442,18 +438,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
@@ -466,13 +462,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -519,18 +514,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -546,13 +541,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -606,23 +600,23 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -633,13 +627,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -688,18 +681,18 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -710,14 +703,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -769,13 +761,13 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -786,14 +778,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -847,8 +838,8 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
@@ -859,14 +850,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -929,14 +919,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1000,14 +989,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1071,14 +1059,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1142,14 +1129,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1213,14 +1199,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1290,8 +1275,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1361,8 +1345,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1432,8 +1415,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1503,8 +1485,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1574,8 +1555,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1645,8 +1625,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1716,8 +1695,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1787,8 +1765,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1858,8 +1835,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -1929,8 +1905,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2000,8 +1975,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2071,8 +2045,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2142,8 +2115,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2213,8 +2185,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
index e50d2b1f837..0595c50e531 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
@@ -162,8 +162,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -174,27 +174,26 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -261,8 +260,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -276,8 +275,8 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -286,8 +285,8 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -298,13 +297,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -396,13 +394,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -411,35 +409,34 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -524,13 +521,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -542,12 +539,12 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -556,12 +553,12 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -572,13 +569,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -688,61 +684,60 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -845,18 +840,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -866,16 +861,16 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -884,16 +879,16 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
@@ -904,13 +899,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1038,72 +1032,71 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1226,68 +1219,67 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1413,63 +1405,62 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1597,58 +1588,57 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1779,52 +1769,51 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1956,52 +1945,51 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2151,34 +2139,33 @@ execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
user1 wait/synch/mutex/sql/LOCK_connection_count 1
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
user2 wait/synch/mutex/sql/LOCK_connection_count 1
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
user3 wait/synch/mutex/sql/LOCK_connection_count 1
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_connection_count 1
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2348,14 +2335,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2525,14 +2511,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2708,8 +2693,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2885,8 +2869,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -3062,8 +3045,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3239,8 +3221,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3416,8 +3397,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3593,8 +3573,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3770,8 +3749,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3947,8 +3925,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4124,8 +4101,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4301,8 +4277,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4478,8 +4453,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -4639,8 +4613,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -4748,8 +4721,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -4821,8 +4793,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
index 4f1dddb3f16..532fd209e18 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
@@ -173,8 +173,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -185,27 +185,26 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -271,8 +270,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -286,8 +285,8 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -298,19 +297,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 2
-localhost wait/synch/rwlock/sql/LOCK_grant 2
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -392,13 +390,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -407,31 +405,30 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -506,13 +503,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -524,12 +521,12 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -540,19 +537,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 4
-localhost wait/synch/rwlock/sql/LOCK_grant 4
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -643,53 +639,52 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -773,18 +768,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -794,16 +789,16 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -814,19 +809,18 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 6
-localhost wait/synch/rwlock/sql/LOCK_grant 6
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -926,60 +920,59 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
localhost wait/synch/mutex/sql/LOCK_connection_count 0
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1074,56 +1067,55 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
localhost wait/synch/mutex/sql/LOCK_connection_count 1
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1221,51 +1213,50 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
localhost wait/synch/mutex/sql/LOCK_connection_count 2
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1365,46 +1356,45 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
localhost wait/synch/mutex/sql/LOCK_connection_count 3
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1507,40 +1497,39 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1644,40 +1633,39 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1801,20 +1789,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1938,20 +1925,19 @@ execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
localhost wait/synch/mutex/sql/LOCK_connection_count 4
-localhost wait/synch/mutex/sql/LOCK_user_locks 8
-localhost wait/synch/rwlock/sql/LOCK_grant 8
+localhost wait/synch/mutex/sql/LOCK_user_locks 0
+localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2081,14 +2067,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2224,8 +2209,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2361,8 +2345,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2498,8 +2481,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2635,8 +2617,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2772,8 +2753,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2909,8 +2889,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3046,8 +3025,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3183,8 +3161,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3320,8 +3297,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3457,8 +3433,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3594,8 +3569,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3715,8 +3689,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3800,8 +3773,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3885,8 +3857,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
index 6de38e218ab..76c7311f99c 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
@@ -147,8 +147,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
user2 not found
username status
@@ -159,8 +159,8 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -169,13 +169,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -232,8 +231,8 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
user2 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -247,8 +246,8 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -261,13 +260,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_user_locks 2
-wait/synch/rwlock/sql/LOCK_grant 2
+wait/synch/rwlock/sql/LOCK_grant 1
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -340,13 +338,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
user3 not found
username status
@@ -355,12 +353,12 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -369,13 +367,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -441,13 +438,13 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
user3 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -459,12 +456,12 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -477,13 +474,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_user_locks 4
-wait/synch/rwlock/sql/LOCK_grant 4
+wait/synch/rwlock/sql/LOCK_grant 2
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -565,34 +561,34 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -601,13 +597,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -682,18 +677,18 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
user4 wait/synch/mutex/sql/LOCK_connection_count 0
@@ -703,16 +698,16 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
@@ -725,13 +720,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_user_locks 6
-wait/synch/rwlock/sql/LOCK_grant 6
+wait/synch/rwlock/sql/LOCK_grant 3
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -822,41 +816,41 @@ call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
user1 wait/synch/mutex/sql/LOCK_connection_count 0
-user1 wait/synch/mutex/sql/LOCK_user_locks 2
-user1 wait/synch/rwlock/sql/LOCK_grant 2
+user1 wait/synch/mutex/sql/LOCK_user_locks 0
+user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -865,13 +859,12 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
wait/synch/mutex/sql/LOCK_connection_count 0
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -957,36 +950,36 @@ user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_connection_count 0
-user2 wait/synch/mutex/sql/LOCK_user_locks 2
-user2 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/synch/mutex/sql/LOCK_user_locks 0
+user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -995,14 +988,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
wait/synch/mutex/sql/LOCK_connection_count 1
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1091,31 +1083,31 @@ user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_connection_count 0
-user3 wait/synch/mutex/sql/LOCK_user_locks 2
-user3 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/synch/mutex/sql/LOCK_user_locks 0
+user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -1124,14 +1116,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
wait/synch/mutex/sql/LOCK_connection_count 2
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1222,26 +1213,26 @@ user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_connection_count 0
-user4 wait/synch/mutex/sql/LOCK_user_locks 2
-user4 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/synch/mutex/sql/LOCK_user_locks 0
+user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -1250,14 +1241,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
wait/synch/mutex/sql/LOCK_connection_count 3
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1351,20 +1341,20 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -1373,14 +1363,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1475,20 +1464,20 @@ execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user1 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user1 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user2 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user2 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user3 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user3 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
-user4 localhost wait/synch/mutex/sql/LOCK_user_locks 2
-user4 localhost wait/synch/rwlock/sql/LOCK_grant 2
+user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
+user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
execute dump_waits_host;
@@ -1497,14 +1486,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1621,14 +1609,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1745,14 +1732,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1869,14 +1855,13 @@ execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/mutex/sql/LOCK_user_locks 0
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -1999,8 +1984,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2123,8 +2107,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 3
@@ -2247,8 +2230,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2371,8 +2353,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2495,8 +2476,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2619,8 +2599,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2743,8 +2722,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2867,8 +2845,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -2991,8 +2968,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3115,8 +3091,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3239,8 +3214,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
user1 localhost stage/sql/checking permissions 0
@@ -3347,8 +3321,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3419,8 +3392,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3491,8 +3463,7 @@ execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/mutex/sql/LOCK_connection_count 4
-wait/synch/mutex/sql/LOCK_user_locks 8
-wait/synch/rwlock/sql/LOCK_grant 8
+wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result
index 1c9d0b8a254..657f45d70e9 100644
--- a/mysql-test/suite/perfschema/r/func_mutex.result
+++ b/mysql-test/suite/perfschema/r/func_mutex.result
@@ -70,52 +70,34 @@ Success
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
-SELECT * FROM t1 WHERE id = 1;
-id b
-1 initial value
+show variables like "%not_found%";
+Variable_name Value
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
-WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
-SELECT * FROM t1;
-id b
-1 initial value
-2 initial value
-3 initial value
-4 initial value
-5 initial value
-6 initial value
-7 initial value
-8 initial value
+WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'));
+show variables like "%not_found%";
+Variable_name Value
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
-WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
+WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed;
test_fm1_rw_timed
Success
UPDATE performance_schema.setup_instruments SET enabled = 'NO'
-WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant';
+WHERE NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash';
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
-SELECT * FROM t1 WHERE id = 1;
-id b
-1 initial value
+show variables like "%not_found%";
+Variable_name Value
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
-WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
-SELECT * FROM t1;
-id b
-1 initial value
-2 initial value
-3 initial value
-4 initial value
-5 initial value
-6 initial value
-7 initial value
-8 initial value
+WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'));
+show variables like "%not_found%";
+Variable_name Value
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
-WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
+WHERE (EVENT_NAME = 'LOCK_system_variables_hash'));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed;
test_fm2_rw_timed
Success
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index 913f98d9663..a50c4ffa297 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -42,12 +42,12 @@ AND EVENT_NAME IN
WHERE NAME LIKE "wait/synch/%")
LIMIT 1;
create table test.t1(a int) engine=performance_schema;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
WHERE object_schema='test';
object_schema object_name
create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
WHERE object_schema='test';
object_schema object_name
diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result
index a7b26b34776..cac92025a97 100644
--- a/mysql-test/suite/perfschema/r/nesting.result
+++ b/mysql-test/suite/perfschema/r/nesting.result
@@ -106,140 +106,135 @@ and (end_event_id <= @marker_end)
) all_events
order by relative_event_id asc;
relative_event_id relative_end_event_id event_name comment nesting_event_type relative_nesting_event_id
-0 19 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL
-1 5 stage/sql/init (stage) STATEMENT 0
+0 18 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL
+1 4 stage/sql/init (stage) STATEMENT 0
2 2 wait/io/socket/sql/client_connection recv STAGE 1
3 3 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1
-4 4 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1
-5 5 wait/io/file/sql/query_log write STAGE 1
-6 6 stage/sql/checking permissions (stage) STATEMENT 0
-7 7 stage/sql/Opening tables (stage) STATEMENT 0
-8 8 stage/sql/init (stage) STATEMENT 0
-9 9 stage/sql/optimizing (stage) STATEMENT 0
-10 12 stage/sql/executing (stage) STATEMENT 0
-11 11 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 10
-12 12 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 10
-13 13 stage/sql/end (stage) STATEMENT 0
-14 14 stage/sql/query end (stage) STATEMENT 0
-15 15 stage/sql/closing tables (stage) STATEMENT 0
-16 16 stage/sql/freeing items (stage) STATEMENT 0
-17 17 wait/io/socket/sql/client_connection send STATEMENT 0
-18 19 stage/sql/cleaning up (stage) STATEMENT 0
-19 19 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 18
-20 20 idle idle NULL NULL
-21 40 statement/sql/select select "This is simple statement one" as payload NULL NULL
-22 26 stage/sql/init (stage) STATEMENT 21
-23 23 wait/io/socket/sql/client_connection recv STAGE 22
-24 24 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 22
-25 25 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 22
-26 26 wait/io/file/sql/query_log write STAGE 22
-27 27 stage/sql/checking permissions (stage) STATEMENT 21
-28 28 stage/sql/Opening tables (stage) STATEMENT 21
-29 29 stage/sql/init (stage) STATEMENT 21
-30 30 stage/sql/optimizing (stage) STATEMENT 21
-31 33 stage/sql/executing (stage) STATEMENT 21
-32 32 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 31
-33 33 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 31
-34 34 stage/sql/end (stage) STATEMENT 21
-35 35 stage/sql/query end (stage) STATEMENT 21
-36 36 stage/sql/closing tables (stage) STATEMENT 21
-37 37 stage/sql/freeing items (stage) STATEMENT 21
-38 38 wait/io/socket/sql/client_connection send STATEMENT 21
-39 40 stage/sql/cleaning up (stage) STATEMENT 21
-40 40 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 39
-41 41 idle idle NULL NULL
-42 61 statement/sql/select select "This is simple statement two" as payload NULL NULL
-43 47 stage/sql/init (stage) STATEMENT 42
-44 44 wait/io/socket/sql/client_connection recv STAGE 43
-45 45 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 43
-46 46 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 43
-47 47 wait/io/file/sql/query_log write STAGE 43
-48 48 stage/sql/checking permissions (stage) STATEMENT 42
-49 49 stage/sql/Opening tables (stage) STATEMENT 42
-50 50 stage/sql/init (stage) STATEMENT 42
-51 51 stage/sql/optimizing (stage) STATEMENT 42
-52 54 stage/sql/executing (stage) STATEMENT 42
-53 53 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 52
-54 54 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 52
-55 55 stage/sql/end (stage) STATEMENT 42
-56 56 stage/sql/query end (stage) STATEMENT 42
-57 57 stage/sql/closing tables (stage) STATEMENT 42
-58 58 stage/sql/freeing items (stage) STATEMENT 42
-59 59 wait/io/socket/sql/client_connection send STATEMENT 42
-60 61 stage/sql/cleaning up (stage) STATEMENT 42
-61 61 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 60
-62 62 idle idle NULL NULL
-63 80 statement/sql/select select "This is the first part of a multi query" as payload;
+4 4 wait/io/file/sql/query_log write STAGE 1
+5 5 stage/sql/checking permissions (stage) STATEMENT 0
+6 6 stage/sql/Opening tables (stage) STATEMENT 0
+7 7 stage/sql/init (stage) STATEMENT 0
+8 8 stage/sql/optimizing (stage) STATEMENT 0
+9 11 stage/sql/executing (stage) STATEMENT 0
+10 10 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 9
+11 11 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 9
+12 12 stage/sql/end (stage) STATEMENT 0
+13 13 stage/sql/query end (stage) STATEMENT 0
+14 14 stage/sql/closing tables (stage) STATEMENT 0
+15 15 stage/sql/freeing items (stage) STATEMENT 0
+16 16 wait/io/socket/sql/client_connection send STATEMENT 0
+17 18 stage/sql/cleaning up (stage) STATEMENT 0
+18 18 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 17
+19 19 idle idle NULL NULL
+20 38 statement/sql/select select "This is simple statement one" as payload NULL NULL
+21 24 stage/sql/init (stage) STATEMENT 20
+22 22 wait/io/socket/sql/client_connection recv STAGE 21
+23 23 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 21
+24 24 wait/io/file/sql/query_log write STAGE 21
+25 25 stage/sql/checking permissions (stage) STATEMENT 20
+26 26 stage/sql/Opening tables (stage) STATEMENT 20
+27 27 stage/sql/init (stage) STATEMENT 20
+28 28 stage/sql/optimizing (stage) STATEMENT 20
+29 31 stage/sql/executing (stage) STATEMENT 20
+30 30 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 29
+31 31 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 29
+32 32 stage/sql/end (stage) STATEMENT 20
+33 33 stage/sql/query end (stage) STATEMENT 20
+34 34 stage/sql/closing tables (stage) STATEMENT 20
+35 35 stage/sql/freeing items (stage) STATEMENT 20
+36 36 wait/io/socket/sql/client_connection send STATEMENT 20
+37 38 stage/sql/cleaning up (stage) STATEMENT 20
+38 38 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 37
+39 39 idle idle NULL NULL
+40 58 statement/sql/select select "This is simple statement two" as payload NULL NULL
+41 44 stage/sql/init (stage) STATEMENT 40
+42 42 wait/io/socket/sql/client_connection recv STAGE 41
+43 43 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 41
+44 44 wait/io/file/sql/query_log write STAGE 41
+45 45 stage/sql/checking permissions (stage) STATEMENT 40
+46 46 stage/sql/Opening tables (stage) STATEMENT 40
+47 47 stage/sql/init (stage) STATEMENT 40
+48 48 stage/sql/optimizing (stage) STATEMENT 40
+49 51 stage/sql/executing (stage) STATEMENT 40
+50 50 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 49
+51 51 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 49
+52 52 stage/sql/end (stage) STATEMENT 40
+53 53 stage/sql/query end (stage) STATEMENT 40
+54 54 stage/sql/closing tables (stage) STATEMENT 40
+55 55 stage/sql/freeing items (stage) STATEMENT 40
+56 56 wait/io/socket/sql/client_connection send STATEMENT 40
+57 58 stage/sql/cleaning up (stage) STATEMENT 40
+58 58 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 57
+59 59 idle idle NULL NULL
+60 76 statement/sql/select select "This is the first part of a multi query" as payload;
select "And this is the second part of a multi query" as payload;
select "With a third part to make things complete" as payload NULL NULL
-64 68 stage/sql/init (stage) STATEMENT 63
-65 65 wait/io/socket/sql/client_connection recv STAGE 64
-66 66 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 64
-67 67 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 64
-68 68 wait/io/file/sql/query_log write STAGE 64
-69 69 stage/sql/checking permissions (stage) STATEMENT 63
-70 70 stage/sql/Opening tables (stage) STATEMENT 63
-71 71 stage/sql/init (stage) STATEMENT 63
-72 72 stage/sql/optimizing (stage) STATEMENT 63
-73 75 stage/sql/executing (stage) STATEMENT 63
-74 74 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 73
-75 75 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 73
-76 76 stage/sql/end (stage) STATEMENT 63
-77 77 stage/sql/query end (stage) STATEMENT 63
-78 78 stage/sql/closing tables (stage) STATEMENT 63
-79 80 stage/sql/freeing items (stage) STATEMENT 63
-80 80 wait/io/socket/sql/client_connection send STAGE 79
-81 95 statement/sql/select select "And this is the second part of a multi query" as payload;
+61 64 stage/sql/init (stage) STATEMENT 60
+62 62 wait/io/socket/sql/client_connection recv STAGE 61
+63 63 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 61
+64 64 wait/io/file/sql/query_log write STAGE 61
+65 65 stage/sql/checking permissions (stage) STATEMENT 60
+66 66 stage/sql/Opening tables (stage) STATEMENT 60
+67 67 stage/sql/init (stage) STATEMENT 60
+68 68 stage/sql/optimizing (stage) STATEMENT 60
+69 71 stage/sql/executing (stage) STATEMENT 60
+70 70 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 69
+71 71 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 69
+72 72 stage/sql/end (stage) STATEMENT 60
+73 73 stage/sql/query end (stage) STATEMENT 60
+74 74 stage/sql/closing tables (stage) STATEMENT 60
+75 76 stage/sql/freeing items (stage) STATEMENT 60
+76 76 wait/io/socket/sql/client_connection send STAGE 75
+77 91 statement/sql/select select "And this is the second part of a multi query" as payload;
select "With a third part to make things complete" as payload NULL NULL
-82 83 stage/sql/init (stage) STATEMENT 81
-83 83 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 82
-84 84 stage/sql/checking permissions (stage) STATEMENT 81
-85 85 stage/sql/Opening tables (stage) STATEMENT 81
-86 86 stage/sql/init (stage) STATEMENT 81
-87 87 stage/sql/optimizing (stage) STATEMENT 81
-88 90 stage/sql/executing (stage) STATEMENT 81
-89 89 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 88
-90 90 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 88
-91 91 stage/sql/end (stage) STATEMENT 81
-92 92 stage/sql/query end (stage) STATEMENT 81
-93 93 stage/sql/closing tables (stage) STATEMENT 81
-94 95 stage/sql/freeing items (stage) STATEMENT 81
-95 95 wait/io/socket/sql/client_connection send STAGE 94
-96 112 statement/sql/select select "With a third part to make things complete" as payload NULL NULL
-97 98 stage/sql/init (stage) STATEMENT 96
-98 98 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 97
-99 99 stage/sql/checking permissions (stage) STATEMENT 96
-100 100 stage/sql/Opening tables (stage) STATEMENT 96
-101 101 stage/sql/init (stage) STATEMENT 96
-102 102 stage/sql/optimizing (stage) STATEMENT 96
-103 105 stage/sql/executing (stage) STATEMENT 96
-104 104 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 103
-105 105 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 103
-106 106 stage/sql/end (stage) STATEMENT 96
-107 107 stage/sql/query end (stage) STATEMENT 96
-108 108 stage/sql/closing tables (stage) STATEMENT 96
-109 109 stage/sql/freeing items (stage) STATEMENT 96
-110 110 wait/io/socket/sql/client_connection send STATEMENT 96
-111 112 stage/sql/cleaning up (stage) STATEMENT 96
-112 112 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 111
-113 113 idle idle NULL NULL
-114 133 statement/sql/select select "MARKER_END" as marker NULL NULL
-115 119 stage/sql/init (stage) STATEMENT 114
-116 116 wait/io/socket/sql/client_connection recv STAGE 115
-117 117 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 115
-118 118 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 115
-119 119 wait/io/file/sql/query_log write STAGE 115
-120 120 stage/sql/checking permissions (stage) STATEMENT 114
-121 121 stage/sql/Opening tables (stage) STATEMENT 114
-122 122 stage/sql/init (stage) STATEMENT 114
-123 123 stage/sql/optimizing (stage) STATEMENT 114
-124 126 stage/sql/executing (stage) STATEMENT 114
-125 125 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 124
-126 126 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 124
-127 127 stage/sql/end (stage) STATEMENT 114
-128 128 stage/sql/query end (stage) STATEMENT 114
-129 129 stage/sql/closing tables (stage) STATEMENT 114
-130 130 stage/sql/freeing items (stage) STATEMENT 114
-131 131 wait/io/socket/sql/client_connection send STATEMENT 114
-132 133 stage/sql/cleaning up (stage) STATEMENT 114
-133 133 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 132
+78 79 stage/sql/init (stage) STATEMENT 77
+79 79 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 78
+80 80 stage/sql/checking permissions (stage) STATEMENT 77
+81 81 stage/sql/Opening tables (stage) STATEMENT 77
+82 82 stage/sql/init (stage) STATEMENT 77
+83 83 stage/sql/optimizing (stage) STATEMENT 77
+84 86 stage/sql/executing (stage) STATEMENT 77
+85 85 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 84
+86 86 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 84
+87 87 stage/sql/end (stage) STATEMENT 77
+88 88 stage/sql/query end (stage) STATEMENT 77
+89 89 stage/sql/closing tables (stage) STATEMENT 77
+90 91 stage/sql/freeing items (stage) STATEMENT 77
+91 91 wait/io/socket/sql/client_connection send STAGE 90
+92 108 statement/sql/select select "With a third part to make things complete" as payload NULL NULL
+93 94 stage/sql/init (stage) STATEMENT 92
+94 94 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 93
+95 95 stage/sql/checking permissions (stage) STATEMENT 92
+96 96 stage/sql/Opening tables (stage) STATEMENT 92
+97 97 stage/sql/init (stage) STATEMENT 92
+98 98 stage/sql/optimizing (stage) STATEMENT 92
+99 101 stage/sql/executing (stage) STATEMENT 92
+100 100 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 99
+101 101 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 99
+102 102 stage/sql/end (stage) STATEMENT 92
+103 103 stage/sql/query end (stage) STATEMENT 92
+104 104 stage/sql/closing tables (stage) STATEMENT 92
+105 105 stage/sql/freeing items (stage) STATEMENT 92
+106 106 wait/io/socket/sql/client_connection send STATEMENT 92
+107 108 stage/sql/cleaning up (stage) STATEMENT 92
+108 108 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 107
+109 109 idle idle NULL NULL
+110 128 statement/sql/select select "MARKER_END" as marker NULL NULL
+111 114 stage/sql/init (stage) STATEMENT 110
+112 112 wait/io/socket/sql/client_connection recv STAGE 111
+113 113 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 111
+114 114 wait/io/file/sql/query_log write STAGE 111
+115 115 stage/sql/checking permissions (stage) STATEMENT 110
+116 116 stage/sql/Opening tables (stage) STATEMENT 110
+117 117 stage/sql/init (stage) STATEMENT 110
+118 118 stage/sql/optimizing (stage) STATEMENT 110
+119 121 stage/sql/executing (stage) STATEMENT 110
+120 120 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 119
+121 121 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 119
+122 122 stage/sql/end (stage) STATEMENT 110
+123 123 stage/sql/query end (stage) STATEMENT 110
+124 124 stage/sql/closing tables (stage) STATEMENT 110
+125 125 stage/sql/freeing items (stage) STATEMENT 110
+126 126 wait/io/socket/sql/client_connection send STATEMENT 110
+127 128 stage/sql/cleaning up (stage) STATEMENT 110
+128 128 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 127
diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
index 55c42c9a149..85e46759f22 100644
--- a/mysql-test/suite/perfschema/r/privilege.result
+++ b/mysql-test/suite/perfschema/r/privilege.result
@@ -152,13 +152,13 @@ before insert on performance_schema.file_instances
for each row begin end;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
insert into performance_schema.setup_instruments
set name="foo";
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
@@ -250,13 +250,13 @@ before insert on performance_schema.file_instances
for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
insert into performance_schema.setup_instruments
set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
@@ -348,13 +348,13 @@ before insert on performance_schema.file_instances
for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
insert into performance_schema.setup_instruments
set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
@@ -446,13 +446,13 @@ before insert on performance_schema.file_instances
for each row begin end;
ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
+ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by database")
insert into performance_schema.setup_instruments
set name="foo";
ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test
index a6940710626..13e63286e8e 100644
--- a/mysql-test/suite/perfschema/t/func_mutex.test
+++ b/mysql-test/suite/perfschema/t/func_mutex.test
@@ -87,38 +87,38 @@ TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
-SELECT * FROM t1 WHERE id = 1;
+show variables like "%not_found%";
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
- WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
+ WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'));
-SELECT * FROM t1;
+show variables like "%not_found%";
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
- WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
+ WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'));
SELECT IF((@after_count - @before_count) > 0, 'Success', 'Failure') test_fm1_rw_timed;
UPDATE performance_schema.setup_instruments SET enabled = 'NO'
-WHERE NAME = 'wait/synch/rwlock/sql/LOCK_grant';
+WHERE NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash';
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
-SELECT * FROM t1 WHERE id = 1;
+show variables like "%not_found%";
SET @before_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
- WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
+ WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_system_variables_hash'));
-SELECT * FROM t1;
+show variables like "%not_found%";
SET @after_count = (SELECT SUM(TIMER_WAIT)
FROM performance_schema.events_waits_history_long
- WHERE (EVENT_NAME = 'wait/synch/rwlock/sql/LOCK_grant'));
+ WHERE (EVENT_NAME = 'LOCK_system_variables_hash'));
SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success', 'Failure') test_fm2_rw_timed;
diff --git a/mysql-test/suite/perfschema/t/misc.test b/mysql-test/suite/perfschema/t/misc.test
index 1c98d43a1f5..af19e8db51d 100644
--- a/mysql-test/suite/perfschema/t/misc.test
+++ b/mysql-test/suite/perfschema/t/misc.test
@@ -5,10 +5,6 @@
--source include/have_perfschema.inc
--source include/have_innodb.inc
-if (`select version() like '10.0.0-%'`) {
- skip upstream bug#67098;
-}
-
#
# Bug#12790483 OBJECTS_SUMMARY_GLOBAL_BY_TYPE AND RENAME TABLE
#