diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/event_aggregate_no_h.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/event_aggregate_no_h.result | 4681 |
1 files changed, 589 insertions, 4092 deletions
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result index 180a6b5e385..a74b0288cd7 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result @@ -1,15 +1,3 @@ -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. "================== Step 1 ==================" call dump_thread(); username status @@ -29,12 +17,6 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) @@ -46,10 +28,9 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; @@ -94,12 +75,6 @@ connection default; call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user1 wait/synch/rwlock/sql/LOCK_grant 0 username status user2 not found @@ -110,62 +85,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user1 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 1 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 user1 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 user1 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; @@ -218,45 +172,25 @@ root 1 1 user1 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con1; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con1 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 3 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user2 not found username status @@ -265,120 +199,52 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 4 -======= wait/io/file/sql/query_log 7 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 1 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 7 -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -======= stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -436,27 +302,10 @@ connection default; "================== Step 4 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 wait/synch/rwlock/sql/LOCK_grant 0 username status user3 not found @@ -464,155 +313,66 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 4 -======= -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 user2 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 5 -======= wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 5 -wait/synch/rwlock/sql/LOCK_grant 1 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 user2 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 localhost stage/sql/Opening tables 0 user2 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 user2 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 stage/sql/Opening tables 0 user2 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -======= stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -679,213 +439,94 @@ user1 1 1 user2 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con2; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con2 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 5 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user3 not found username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 8 -======= wait/io/file/sql/query_log 14 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 14 -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -======= stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -957,229 +598,92 @@ connection default; "================== Step 6 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star user3 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 wait/synch/rwlock/sql/LOCK_grant 0 username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 4 -======= -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 9 -======= wait/io/file/sql/query_log 15 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 9 wait/synch/rwlock/sql/LOCK_grant 2 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 15 -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 user3 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 localhost stage/sql/Opening tables 0 user3 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 0 user3 stage/sql/closing tables 0 user3 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 stage/sql/Opening tables 0 user3 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -======= stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1260,259 +764,109 @@ user2 1 1 user3 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con3; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con3 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 7 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 12 -======= wait/io/file/sql/query_log 21 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 3 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 21 -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -======= stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1598,275 +952,107 @@ connection default; "================== Step 8 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star user4 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -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 -======= -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 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 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 4 -======= -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 13 -======= wait/io/file/sql/query_log 22 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 13 -wait/synch/rwlock/sql/LOCK_grant 3 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 22 -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -======= stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1961,305 +1147,124 @@ user3 1 1 user4 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con4; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con4 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 9 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 16 -======= wait/io/file/sql/query_log 28 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 4 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 16 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 28 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 20 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 20 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 24 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2361,270 +1366,104 @@ call dump_thread(); username status user1 not found username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 17 -======= wait/io/file/sql/query_log 29 -wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 17 -======= wait/io/file/sql/query_log 29 -wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 21 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 21 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 25 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2729,256 +1568,101 @@ user1 not found username status user2 not found username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 18 -======= wait/io/file/sql/query_log 30 -wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 18 -======= wait/io/file/sql/query_log 30 -wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 22 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 22 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 26 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3085,242 +1769,98 @@ user2 not found username status user3 not found username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 8 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 19 -======= wait/io/file/sql/query_log 31 -wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 19 -======= wait/io/file/sql/query_log 31 -wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 23 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 23 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 27 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3430,227 +1970,94 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 8 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 8 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 8 -user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3761,227 +2168,94 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 8 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 8 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 8 -user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4092,221 +2366,93 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 5 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -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_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_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_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 8 -user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4417,216 +2563,93 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4737,216 +2760,93 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5057,211 +2957,93 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5372,211 +3154,93 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5687,114 +3351,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -5809,85 +3398,46 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5998,114 +3548,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -6120,32 +3595,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -6160,40 +3617,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6304,114 +3745,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -6426,32 +3792,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -6466,40 +3814,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6610,114 +3942,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -6732,32 +3989,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -6772,34 +4011,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6910,114 +4139,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -7032,32 +4186,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -7072,34 +4208,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -7210,111 +4336,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -7329,32 +4383,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -7369,34 +4405,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -7507,111 +4533,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -7626,32 +4580,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -7666,34 +4602,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -7804,111 +4730,39 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -7923,32 +4777,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -7963,34 +4799,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -8101,78 +4927,33 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; 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_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8229,9 +5010,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -8343,53 +5124,33 @@ 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; 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_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8446,9 +5207,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -8560,57 +5321,33 @@ 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; 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_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8667,9 +5404,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -8781,57 +5518,33 @@ 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; 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_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8888,9 +5601,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -9002,89 +5715,39 @@ 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -9099,32 +5762,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -9139,32 +5784,23 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -9276,57 +5912,33 @@ 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 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_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; 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_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -9383,11 +5995,10 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -9500,85 +6111,31 @@ user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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_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_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_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 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_uuid_generator 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_uuid_generator 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_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -9593,34 +6150,24 @@ user3 stage/sql/starting 0 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -9709,27 +6256,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -9738,27 +6269,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -9819,27 +6341,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -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 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -9848,27 +6354,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star execute dump_statements_user; |