database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Maintain connection_count atomically

Browse Source 
Removed LOCK_connection_count.

Removed duplicate denied_connections and connection_errors_max_connection
increment from create_new_thread(). Another increment done by
CONNECT::close_with_error().

Simplified away CONNECT::thread_count_incremented. Now close_with_error()
is always called with connection_count incremented.

Part of MDEV-19515 - Improve connect speed
This commit is contained in:
Sergey Vojtovich
2019-05-19 17:00:31 +04:00
parent 0bee021b78
commit a61baa7a25
21 changed files with 31 additions and 1628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/thread_pool_priv.h
View File

@ -92,8 +92,6 @@ void mysql_audit_release(THD *thd);
bool thd_is_connection_alive(THD *thd);
/* Close connection with possible error code */
void close_connection(THD *thd, uint errcode);
/* Decrement connection counter */
void dec_connection_count();
/* Destroy THD object */
void delete_thd(THD *thd);

3
mysql-test/suite/perfschema/include/event_aggregate_load.inc
View File

@ -27,9 +27,6 @@ execute dump_hosts;
# Notes about this test
#
# Each connect causes 2 wait/synch/mutex/sql/LOCK_connection_count events:
# - 1 in mysqld.cc, create_new_thread(), for the main thread
# - 1 in sql_connect.cc, check_user(), for the connected thread
# The main thread does not count for BY_ACCOUNT / BY_HOST.
# The user thread does count for BY_ACCOUNT, BY_HOST
#

21
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
View File

@ -111,8 +111,7 @@ update performance_schema.threads set instrumented='NO';
update performance_schema.setup_instruments set enabled='NO', timed='NO';
update performance_schema.setup_instruments set enabled='YES', timed='YES'
where name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
where name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log',
'idle');
@ -181,8 +180,7 @@ begin
if (my_thread_id is not null) then
select username, event_name, count_star
from performance_schema.events_waits_summary_by_thread_by_event_name
where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
where event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
and thread_id = my_thread_id
@ -199,8 +197,7 @@ prepare dump_waits_account from
"select user, host, event_name, count_star
from performance_schema.events_waits_summary_by_account_by_event_name
where user like \'user%\'
and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
and event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by user, host, event_name;";
@ -209,8 +206,7 @@ prepare dump_waits_user from
"select user, event_name, count_star
from performance_schema.events_waits_summary_by_user_by_event_name
where user like \'user%\'
and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
and event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by user, event_name;";
@ -219,8 +215,7 @@ prepare dump_waits_host from
"select host, event_name, count_star
from performance_schema.events_waits_summary_by_host_by_event_name
where host=\'localhost\'
and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
and event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by host, event_name;";
@ -228,8 +223,7 @@ prepare dump_waits_host from
prepare dump_waits_global from
"select event_name, count_star
from performance_schema.events_waits_summary_global_by_event_name
where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
where event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by event_name;";
@ -237,8 +231,7 @@ prepare dump_waits_global from
prepare dump_waits_history from
"select event_name, count(event_name)
from performance_schema.events_waits_history_long
where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
'wait/synch/mutex/sql/LOCK_user_locks',
where event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
group by event_name order by event_name;";

306
mysql-test/suite/perfschema/r/event_aggregate.result
View File

File diff suppressed because it is too large Load Diff

210
mysql-test/suite/perfschema/r/event_aggregate_no_a.result
View File

File diff suppressed because it is too large Load Diff

179
mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
View File

@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -64,7 +63,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -78,7 +76,6 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 1
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -86,7 +83,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -151,7 +147,6 @@ connection default;
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 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -165,7 +160,6 @@ 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 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -173,7 +167,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -239,12 +232,10 @@ connection default;
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 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
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -256,11 +247,9 @@ 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 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
user2 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -268,7 +257,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -351,12 +339,10 @@ connection default;
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 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 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -368,11 +354,9 @@ 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 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 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -380,7 +364,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -456,17 +439,14 @@ connection default;
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 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 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
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -476,15 +456,12 @@ 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 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 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
user3 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -492,7 +469,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -585,17 +561,14 @@ connection default;
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 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 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 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -605,15 +578,12 @@ 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 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 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 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -621,7 +591,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -707,22 +676,18 @@ connection default;
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 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 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 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
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@ -730,19 +695,15 @@ 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 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 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 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
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -750,7 +711,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -853,22 +813,18 @@ connection default;
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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -876,19 +832,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -896,7 +848,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@ -994,17 +945,14 @@ username status
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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -1012,19 +960,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -1032,13 +976,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1134,12 +1076,10 @@ username status
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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -1147,19 +1087,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -1167,13 +1103,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1271,7 +1205,6 @@ username status
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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -1279,19 +1212,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -1299,13 +1228,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1408,19 +1335,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -1428,13 +1351,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1538,19 +1459,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -1558,13 +1475,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1667,19 +1582,15 @@ 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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@ -1687,13 +1598,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1796,19 +1705,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -1816,13 +1721,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1925,19 +1828,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -1945,13 +1844,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2054,19 +1951,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2074,13 +1967,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2183,19 +2074,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2203,13 +2090,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2312,19 +2197,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2332,13 +2213,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2441,19 +2320,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2461,13 +2336,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2570,19 +2443,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2590,13 +2459,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2699,19 +2566,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2719,13 +2582,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2828,19 +2689,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2848,13 +2705,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2957,19 +2812,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -2977,13 +2828,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3086,19 +2935,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -3106,13 +2951,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3215,19 +3058,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -3235,13 +3074,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3344,19 +3181,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -3364,13 +3197,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3473,19 +3304,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@ -3493,13 +3320,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3606,13 +3431,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3679,13 +3502,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star

110
mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
View File

@ -15,13 +15,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -77,7 +75,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -93,13 +90,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 1
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -163,7 +158,6 @@ connection default;
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 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -179,13 +173,11 @@ 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 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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -250,12 +242,10 @@ connection default;
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 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
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -269,13 +259,11 @@ user event_name count_star
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 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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -347,12 +335,10 @@ connection default;
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 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 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -366,13 +352,11 @@ 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 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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -437,17 +421,14 @@ connection default;
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 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 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
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -459,13 +440,11 @@ user event_name count_star
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 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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -537,17 +516,14 @@ connection default;
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 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 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 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -559,13 +535,11 @@ 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 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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -630,22 +604,18 @@ connection default;
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 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 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 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
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@ -655,13 +625,11 @@ user event_name count_star
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 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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -733,22 +701,18 @@ connection default;
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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -758,13 +722,11 @@ 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 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 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@ -831,17 +793,14 @@ username status
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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -851,19 +810,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -928,12 +884,10 @@ username status
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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -943,19 +897,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1022,7 +973,6 @@ username status
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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -1032,19 +982,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1118,19 +1065,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1205,19 +1149,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1291,19 +1232,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1377,19 +1315,16 @@ 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 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1463,19 +1398,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1549,19 +1481,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1635,19 +1564,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1721,19 +1647,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1807,19 +1730,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1893,19 +1813,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1979,19 +1896,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2065,19 +1979,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2151,19 +2062,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2237,19 +2145,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2323,19 +2228,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2409,19 +2311,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2495,19 +2394,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2581,19 +2477,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2667,19 +2560,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star

79
mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
View File

@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -63,7 +62,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -81,7 +79,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -135,7 +132,6 @@ connection default;
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 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -153,7 +149,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -208,12 +203,10 @@ connection default;
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 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
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -229,7 +222,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -291,12 +283,10 @@ connection default;
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 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 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -312,7 +302,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -367,17 +356,14 @@ connection default;
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 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 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
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -391,7 +377,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -453,17 +438,14 @@ connection default;
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 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 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 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -477,7 +459,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -532,22 +513,18 @@ connection default;
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 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 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 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
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@ -559,7 +536,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -621,22 +597,18 @@ connection default;
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 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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -648,7 +620,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@ -705,17 +676,14 @@ username status
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 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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -727,13 +695,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -788,12 +754,10 @@ username status
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 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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -805,13 +769,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -868,7 +830,6 @@ username status
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 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@ -880,13 +841,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -952,13 +911,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1025,13 +982,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1097,13 +1052,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1169,13 +1122,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1241,13 +1192,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1313,13 +1262,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1385,13 +1332,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1457,13 +1402,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1529,13 +1472,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1601,13 +1542,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1673,13 +1612,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1745,13 +1682,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1817,13 +1752,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1889,13 +1822,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1961,13 +1892,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2033,13 +1962,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2105,13 +2032,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2177,13 +2102,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2249,13 +2172,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star

275
mysql-test/suite/perfschema/r/event_aggregate_no_h.result
View File

File diff suppressed because it is too large Load Diff

206
mysql-test/suite/perfschema/r/event_aggregate_no_u.result
View File

File diff suppressed because it is too large Load Diff

175
mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
View File

@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -64,7 +63,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -76,7 +74,6 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 1
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -86,7 +83,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@ -151,7 +147,6 @@ connection default;
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 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -163,7 +158,6 @@ 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 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -173,7 +167,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -239,12 +232,10 @@ connection default;
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 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
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -254,11 +245,9 @@ 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 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
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -268,7 +257,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@ -351,12 +339,10 @@ connection default;
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 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 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -366,11 +352,9 @@ 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 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 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -380,7 +364,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -456,17 +439,14 @@ connection default;
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 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 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
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@ -474,15 +454,12 @@ 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 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 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
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -492,7 +469,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@ -585,17 +561,14 @@ connection default;
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 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 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 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@ -603,15 +576,12 @@ 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 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 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 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -621,7 +591,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -707,40 +676,32 @@ connection default;
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 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 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 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
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
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 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 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 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
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -750,7 +711,6 @@ host event_name count_star
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 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@ -853,40 +813,32 @@ connection default;
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 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 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 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 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 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 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 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 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -896,7 +848,6 @@ 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 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@ -994,35 +945,28 @@ username status
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 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 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 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 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 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 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 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -1032,13 +976,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1134,30 +1076,24 @@ username status
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 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 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 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 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 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 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -1167,13 +1103,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1271,25 +1205,20 @@ username status
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 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 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 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 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 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -1299,13 +1228,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1406,19 +1333,15 @@ user4 not found
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 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 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 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 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -1428,13 +1351,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1536,19 +1457,15 @@ user4 not found
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 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 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 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 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@ -1558,13 +1475,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1665,19 +1580,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -1687,13 +1598,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1794,19 +1703,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -1816,13 +1721,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -1923,19 +1826,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -1945,13 +1844,11 @@ 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 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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2052,19 +1949,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2074,13 +1967,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2181,19 +2072,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2203,13 +2090,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2310,19 +2195,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2332,13 +2213,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2439,19 +2318,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2461,13 +2336,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2568,19 +2441,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2590,13 +2459,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2697,19 +2564,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2719,13 +2582,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2826,19 +2687,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2848,13 +2705,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -2955,19 +2810,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -2977,13 +2828,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3084,19 +2933,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -3106,13 +2951,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3213,19 +3056,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -3235,13 +3074,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3342,19 +3179,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@ -3364,13 +3197,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3477,13 +3308,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3550,13 +3379,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@ -3623,13 +3450,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
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/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star

4
mysql-test/suite/perfschema/r/server_init.result
View File

@ -88,10 +88,6 @@ where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
count(name)
1
select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_connection_count";
count(name)
1
select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_server_started";
count(name)
1

3
mysql-test/suite/perfschema/t/server_init.test
View File

@ -85,9 +85,6 @@ select count(name) from mutex_instances
select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_connection_count";
select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_server_started";

50
sql/mysqld.cc
View File

@ -706,7 +706,7 @@ mysql_mutex_t
LOCK_crypt,
LOCK_global_system_variables,
LOCK_user_conn,
LOCK_connection_count, LOCK_error_messages, LOCK_slave_background;
LOCK_error_messages, LOCK_slave_background;
mysql_mutex_t LOCK_stats, LOCK_global_user_client_stats,
LOCK_global_table_stats, LOCK_global_index_stats;
@ -864,7 +864,7 @@ PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list,
key_BINLOG_LOCK_binlog_background_thread,
key_LOCK_binlog_end_pos,
key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi,
key_LOCK_connection_count, key_LOCK_crypt, key_LOCK_delayed_create,
key_LOCK_crypt, key_LOCK_delayed_create,
key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log,
key_LOCK_gdl, key_LOCK_global_system_variables,
key_LOCK_manager,
@ -929,7 +929,6 @@ static PSI_mutex_info all_server_mutexes[]=
{ &key_delayed_insert_mutex, "Delayed_insert::mutex", 0},
{ &key_hash_filo_lock, "hash_filo::lock", 0},
{ &key_LOCK_active_mi, "LOCK_active_mi", PSI_FLAG_GLOBAL},
{ &key_LOCK_connection_count, "LOCK_connection_count", PSI_FLAG_GLOBAL},
{ &key_LOCK_thread_id, "LOCK_thread_id", PSI_FLAG_GLOBAL},
{ &key_LOCK_crypt, "LOCK_crypt", PSI_FLAG_GLOBAL},
{ &key_LOCK_delayed_create, "LOCK_delayed_create", PSI_FLAG_GLOBAL},
@ -1474,10 +1473,10 @@ struct st_VioSSLFd *ssl_acceptor_fd;
#endif /* HAVE_OPENSSL */
/**
Number of currently active user connections. The variable is protected by
LOCK_connection_count.
Number of currently active user connections.
*/
uint connection_count= 0, extra_connection_count= 0;
Atomic_counter<uint> connection_count;
static Atomic_counter<uint> extra_connection_count;
my_bool opt_gtid_strict_mode= FALSE;
@ -2106,7 +2105,6 @@ static void clean_up_mutexes()
mysql_mutex_destroy(&LOCK_delayed_create);
mysql_mutex_destroy(&LOCK_crypt);
mysql_mutex_destroy(&LOCK_user_conn);
mysql_mutex_destroy(&LOCK_connection_count);
mysql_mutex_destroy(&LOCK_thread_id);
mysql_mutex_destroy(&LOCK_stats);
mysql_mutex_destroy(&LOCK_global_user_client_stats);
@ -2598,20 +2596,6 @@ extern "C" sig_handler end_mysqld_signal(int sig __attribute__((unused)))
}
#endif /* EMBEDDED_LIBRARY */
/*
Decrease number of connections
SYNOPSIS
dec_connection_count()
*/
void dec_connection_count(scheduler_functions *scheduler)
{
mysql_mutex_lock(&LOCK_connection_count);
(*scheduler->connection_count)--;
mysql_mutex_unlock(&LOCK_connection_count);
}
/*
Unlink thd from global list of available connections
@ -2637,7 +2621,7 @@ void unlink_thd(THD *thd)
*/
if (!thd->wsrep_applier)
#endif /* WITH_WSREP */
dec_connection_count(thd->scheduler);
--*thd->scheduler->connection_count;
thd->free_connection();
@ -4426,8 +4410,6 @@ static int init_thread_environment()
&LOCK_error_messages, MY_MUTEX_INIT_FAST);
mysql_mutex_init(key_LOCK_uuid_short_generator,
&LOCK_short_uuid_generator, MY_MUTEX_INIT_FAST);
mysql_mutex_init(key_LOCK_connection_count,
&LOCK_connection_count, MY_MUTEX_INIT_FAST);
mysql_mutex_init(key_LOCK_thread_id,
&LOCK_thread_id, MY_MUTEX_INIT_FAST);
mysql_mutex_init(key_LOCK_stats, &LOCK_stats, MY_MUTEX_INIT_FAST);
@ -6172,29 +6154,17 @@ void create_new_thread(CONNECT *connect)
Don't allow too many connections. We roughly check here that we allow
only (max_connections + 1) connections.
*/
mysql_mutex_lock(&LOCK_connection_count);
if (*connect->scheduler->connection_count >=
if ((*connect->scheduler->connection_count)++ >=
*connect->scheduler->max_connections + 1)
{
DBUG_PRINT("error",("Too many connections"));
mysql_mutex_unlock(&LOCK_connection_count);
statistic_increment(denied_connections, &LOCK_status);
statistic_increment(connection_errors_max_connection, &LOCK_status);
connect->close_with_error(0, NullS, ER_CON_COUNT_ERROR);
DBUG_VOID_RETURN;
}
++*connect->scheduler->connection_count;
if (connection_count + extra_connection_count > max_used_connections)
max_used_connections= connection_count + extra_connection_count;
mysql_mutex_unlock(&LOCK_connection_count);
connect->thread_count_incremented= 1;
uint sum= connection_count + extra_connection_count;
if (sum > max_used_connections)
max_used_connections= sum;
/*
The initialization of thread_id is done in create_embedded_thd() for

8
sql/mysqld.h
View File

@ -83,7 +83,6 @@ CONNECT *cache_thread(THD *thd);
void flush_thread_cache();
void refresh_status(THD *thd);
bool is_secure_file_path(char *path);
void dec_connection_count(scheduler_functions *scheduler);
extern void init_net_server_extension(THD *thd);
extern void handle_accepted_socket(MYSQL_SOCKET new_sock, MYSQL_SOCKET sock);
extern void create_new_thread(CONNECT *connect);
@ -119,7 +118,7 @@ extern bool opt_ignore_builtin_innodb;
extern my_bool opt_character_set_client_handshake;
extern my_bool debug_assert_on_not_freed_memory;
extern bool volatile abort_loop;
extern uint connection_count;
extern Atomic_counter<uint> connection_count;
extern my_bool opt_safe_user_create;
extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap;
extern my_bool opt_slave_compressed_protocol, use_temp_pool;
@ -318,7 +317,7 @@ extern PSI_mutex_key key_BINLOG_LOCK_index, key_BINLOG_LOCK_xid_list,
key_BINLOG_LOCK_binlog_background_thread,
key_LOCK_binlog_end_pos,
key_delayed_insert_mutex, key_hash_filo_lock, key_LOCK_active_mi,
key_LOCK_connection_count, key_LOCK_crypt, key_LOCK_delayed_create,
key_LOCK_crypt, key_LOCK_delayed_create,
key_LOCK_delayed_insert, key_LOCK_delayed_status, key_LOCK_error_log,
key_LOCK_gdl, key_LOCK_global_system_variables,
key_LOCK_logger, key_LOCK_manager,
@ -615,7 +614,7 @@ extern mysql_mutex_t
LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,
LOCK_active_mi, LOCK_manager,
LOCK_global_system_variables, LOCK_user_conn,
LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count,
LOCK_prepared_stmt_count, LOCK_error_messages,
LOCK_slave_background;
extern mysql_rwlock_t LOCK_all_status_vars;
extern mysql_mutex_t LOCK_start_thread;
@ -827,7 +826,6 @@ inline int set_current_thd(THD *thd)
*/
extern handlerton *maria_hton;
extern uint extra_connection_count;
extern uint64 global_gtid_counter;
extern my_bool opt_gtid_strict_mode;
extern my_bool opt_userstat_running, debug_assert_if_crashed_table;

2
sql/scheduler.cc
View File

@ -112,7 +112,7 @@ void post_kill_notification(THD *thd)
void one_thread_per_connection_scheduler(scheduler_functions *func,
ulong *arg_max_connections,
uint *arg_connection_count)
Atomic_counter<uint> *arg_connection_count)
{
scheduler_init();
func->max_threads= *arg_max_connections + 1;

7
sql/scheduler.h
View File

@ -31,7 +31,8 @@ class THD;
struct scheduler_functions
{
uint max_threads, *connection_count;
uint max_threads;
Atomic_counter<uint> *connection_count;
ulong *max_connections;
bool (*init)(void);
void (*add_connection)(CONNECT *connect);
@ -70,7 +71,7 @@ enum scheduler_types
};
void one_thread_per_connection_scheduler(scheduler_functions *func,
ulong *arg_max_connections, uint *arg_connection_count);
ulong *arg_max_connections, Atomic_counter<uint> *arg_connection_count);
void one_thread_scheduler(scheduler_functions *func);
extern void scheduler_init();
@ -98,7 +99,7 @@ public:
#ifdef HAVE_POOL_OF_THREADS
void pool_of_threads_scheduler(scheduler_functions* func,
ulong *arg_max_connections,
uint *arg_connection_count);
Atomic_counter<uint> *arg_connection_count);
#else
#define pool_of_threads_scheduler(A,B,C) \
one_thread_per_connection_scheduler(A, B, C)

6
sql/sql_acl.cc
View File

@ -13947,11 +13947,7 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len)
if (command == COM_CONNECT &&
!(thd->main_security_ctx.master_access & SUPER_ACL))
{
mysql_mutex_lock(&LOCK_connection_count);
bool count_ok= (*thd->scheduler->connection_count <=
*thd->scheduler->max_connections);
mysql_mutex_unlock(&LOCK_connection_count);
if (!count_ok)
if (*thd->scheduler->connection_count > *thd->scheduler->max_connections)
{ // too many connections
my_error(ER_CON_COUNT_ERROR, MYF(0));
DBUG_RETURN(1);

5
sql/sql_connect.cc
View File

@ -1350,7 +1350,7 @@ void do_handle_one_connection(CONNECT *connect, bool put_in_cache)
THD *thd;
if (!(thd= connect->create_thd(NULL)))
{
connect->close_with_error(0, 0, ER_OUT_OF_RESOURCES);
connect->close_and_delete();
return;
}
@ -1483,8 +1483,7 @@ void CONNECT::close_and_delete()
mysql_socket_close(sock);
vio_type= VIO_CLOSED;
if (thread_count_incremented)
dec_connection_count(scheduler);
--*scheduler->connection_count;
statistic_increment(connection_errors_internal, &LOCK_status);
statistic_increment(aborted_connects,&LOCK_status);

6
sql/sql_connect.h
View File

@ -35,21 +35,19 @@ public:
#ifdef _WIN32
HANDLE pipe;
CONNECT(HANDLE pipe_arg): pipe(pipe_arg), vio_type(VIO_TYPE_NAMEDPIPE),
scheduler(thread_scheduler), thread_id(0), thread_count_incremented(0),
prior_thr_create_utime(0) {}
scheduler(thread_scheduler), thread_id(0), prior_thr_create_utime(0) {}
#endif
enum enum_vio_type vio_type;
scheduler_functions *scheduler;
my_thread_id thread_id;
/* Own variables */
bool thread_count_incremented;
ulonglong prior_thr_create_utime;
CONNECT(MYSQL_SOCKET sock_arg, enum enum_vio_type vio_type_arg,
scheduler_functions *scheduler_arg): sock(sock_arg),
vio_type(vio_type_arg), scheduler(scheduler_arg), thread_id(0),
thread_count_incremented(0), prior_thr_create_utime(0) {}
prior_thr_create_utime(0) {}
~CONNECT() { DBUG_ASSERT(vio_type == VIO_CLOSED); }
void close_and_delete();
void close_with_error(uint sql_errno,

2
sql/threadpool_common.cc
View File

@ -508,7 +508,7 @@ static scheduler_functions tp_scheduler_functions=
void pool_of_threads_scheduler(struct scheduler_functions *func,
ulong *arg_max_connections,
uint *arg_connection_count)
Atomic_counter<uint> *arg_connection_count)
{
*func = tp_scheduler_functions;
func->max_threads= threadpool_max_threads;