diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result | 3210 |
1 files changed, 406 insertions, 2804 deletions
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result index 8565f759bea..76f183fa43d 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result @@ -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; @@ -93,12 +74,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 @@ -111,24 +86,12 @@ user host event_name count_star 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) @@ -137,20 +100,18 @@ 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 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; @@ -195,45 +156,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 @@ -244,93 +185,43 @@ execute dump_waits_account; user host event_name count_star 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 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 -======= 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 execute dump_statements_user; @@ -380,27 +271,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 @@ -410,110 +284,50 @@ execute dump_waits_account; user host event_name count_star 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 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 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 execute dump_statements_user; @@ -565,59 +379,28 @@ 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 @@ -626,110 +409,50 @@ execute dump_waits_account; user host event_name count_star 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 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 -======= 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 execute dump_statements_user; @@ -786,41 +509,13 @@ 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 @@ -828,127 +523,57 @@ execute dump_waits_account; user host event_name count_star 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 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 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 execute dump_statements_user; @@ -1007,200 +632,88 @@ 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 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 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 -======= 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 execute dump_statements_user; @@ -1264,198 +777,79 @@ 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/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_account; user host event_name count_star 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 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 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 execute dump_statements_user; @@ -1521,229 +915,96 @@ 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 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 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 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 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 execute dump_statements_user; @@ -1816,194 +1077,76 @@ 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 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 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 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 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 execute dump_statements_user; @@ -2079,180 +1222,73 @@ 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 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 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 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 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 execute dump_statements_user; @@ -2330,166 +1366,70 @@ 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 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 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 5 -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 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 execute dump_statements_user; @@ -2572,149 +1512,64 @@ execute dump_waits_account; user host event_name count_star 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 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 execute dump_statements_user; @@ -2798,149 +1653,64 @@ execute dump_waits_account; user host event_name count_star 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 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 execute dump_statements_user; @@ -3023,149 +1793,64 @@ execute dump_waits_account; user host event_name count_star 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 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 execute dump_statements_user; @@ -3249,143 +1934,63 @@ 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 -<<<<<<< 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 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 execute dump_statements_user; @@ -3469,143 +2074,63 @@ 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 -<<<<<<< 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 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 execute dump_statements_user; @@ -3689,138 +2214,63 @@ 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 -<<<<<<< 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 execute dump_statements_user; @@ -3904,138 +2354,63 @@ 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 -<<<<<<< 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 execute dump_statements_user; @@ -4119,138 +2494,63 @@ 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 -<<<<<<< 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 execute dump_statements_user; @@ -4334,85 +2634,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 @@ -4427,40 +2673,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 execute dump_statements_user; @@ -4544,85 +2774,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 @@ -4637,40 +2813,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 execute dump_statements_user; @@ -4754,85 +2914,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 @@ -4847,34 +2953,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; @@ -4958,85 +3054,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 @@ -5051,34 +3093,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; @@ -5162,85 +3194,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 @@ -5255,34 +3233,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; @@ -5366,85 +3334,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 @@ -5459,34 +3373,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; @@ -5570,85 +3474,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 @@ -5663,34 +3513,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; @@ -5774,85 +3614,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 @@ -5867,34 +3653,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; @@ -5978,85 +3754,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 @@ -6071,34 +3793,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; @@ -6182,47 +3894,23 @@ user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_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 -<<<<<<< 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; @@ -6251,27 +3939,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; @@ -6355,47 +4034,23 @@ user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_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 -<<<<<<< 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; @@ -6424,25 +4079,17 @@ 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 @@ -6527,35 +4174,23 @@ user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_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 execute dump_stages_user; @@ -6592,11 +4227,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 execute dump_statements_user; @@ -6680,35 +4314,23 @@ user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_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 execute dump_stages_user; @@ -6745,9 +4367,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 @@ -6832,35 +4454,23 @@ user host event_name count_star execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_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 execute dump_stages_user; @@ -6897,9 +4507,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 @@ -6988,15 +4598,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_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 execute dump_stages_user; @@ -7013,9 +4619,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 @@ -7076,15 +4682,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_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 execute dump_stages_user; @@ -7101,9 +4703,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 |