diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/event_aggregate.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/event_aggregate.result | 5265 |
1 files changed, 682 insertions, 4583 deletions
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result index 870880fd539..2582262c8c4 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate.result +++ b/mysql-test/suite/perfschema/r/event_aggregate.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 @@ -27,22 +15,10 @@ user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 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) @@ -52,18 +28,16 @@ execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 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; @@ -115,12 +89,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 @@ -131,76 +99,48 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user1 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 1 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 user1 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 user1 stage/sql/starting 0 execute dump_stages_host; host event_name count_star -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 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; @@ -260,45 +200,25 @@ user1 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS localhost 2 2 -<<<<<<< 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 @@ -307,144 +227,59 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 4 -======= localhost wait/io/file/sql/query_log 7 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 4 -======= wait/io/file/sql/query_log 7 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 4 -wait/synch/rwlock/sql/LOCK_grant 1 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 7 -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 6 -localhost stage/sql/Init 5 -localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 4 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 4 -localhost stage/sql/Opening tables 6 +localhost stage/sql/closing tables 13 +localhost stage/sql/init 3 +localhost stage/sql/Opening tables 7 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -509,27 +344,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 @@ -537,180 +355,73 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 user2 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 4 -======= -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 user2 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_host; -host event_name count_star -localhost wait/io/file/sql/query_log 5 -======= -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 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 8 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 5 -======= wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 5 -wait/synch/rwlock/sql/LOCK_grant 1 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 user2 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 localhost stage/sql/Opening tables 0 user2 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 user2 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 stage/sql/Opening tables 0 user2 stage/sql/starting 0 execute dump_stages_host; host event_name count_star -<<<<<<< HEAD -localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 6 -localhost stage/sql/Init 5 -localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 4 -execute dump_stages_global; -event_name count_star -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 -======= localhost stage/sql/checking permissions 4 -localhost stage/sql/closing tables 6 -localhost stage/sql/init 4 -localhost stage/sql/Opening tables 6 +localhost stage/sql/closing tables 13 +localhost stage/sql/init 3 +localhost stage/sql/Opening tables 7 localhost stage/sql/starting 6 execute dump_stages_global; event_name count_star stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -784,237 +495,101 @@ user2 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS localhost 3 3 -<<<<<<< HEAD connection con2; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con2 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 5 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user3 not found username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 4 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 8 -======= localhost wait/io/file/sql/query_log 14 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 2 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 8 -======= wait/io/file/sql/query_log 14 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 14 -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 10 -localhost stage/sql/Init 10 -localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 7 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 8 -localhost stage/sql/Opening tables 12 +localhost stage/sql/closing tables 24 +localhost stage/sql/init 6 +localhost stage/sql/Opening tables 13 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1093,254 +668,99 @@ connection default; "================== Step 6 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star user3 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 wait/synch/rwlock/sql/LOCK_grant 0 username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 4 -======= -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 4 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_host; -host event_name count_star -localhost wait/io/file/sql/query_log 9 -======= -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 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 15 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 2 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 4 -localhost wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 9 -======= wait/io/file/sql/query_log 15 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 9 wait/synch/rwlock/sql/LOCK_grant 2 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 15 -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 user3 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 localhost stage/sql/Opening tables 0 user3 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 0 user3 stage/sql/closing tables 0 user3 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 stage/sql/Opening tables 0 user3 stage/sql/starting 0 execute dump_stages_host; host event_name count_star -<<<<<<< HEAD -localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 10 -localhost stage/sql/Init 10 -localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 7 -execute dump_stages_global; -event_name count_star -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 -======= localhost stage/sql/checking permissions 8 -localhost stage/sql/closing tables 12 -localhost stage/sql/init 8 -localhost stage/sql/Opening tables 12 +localhost stage/sql/closing tables 24 +localhost stage/sql/init 6 +localhost stage/sql/Opening tables 13 localhost stage/sql/starting 12 execute dump_stages_global; event_name count_star stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1428,283 +848,116 @@ user3 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS localhost 4 4 -<<<<<<< HEAD connection con3; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con3 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 7 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 4 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 4 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 12 -======= localhost wait/io/file/sql/query_log 21 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 3 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 12 -======= wait/io/file/sql/query_log 21 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 3 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 21 -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 14 -localhost stage/sql/Init 15 -localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 10 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 18 -localhost stage/sql/init 12 -localhost stage/sql/Opening tables 18 +localhost stage/sql/closing tables 35 +localhost stage/sql/init 9 +localhost stage/sql/Opening tables 19 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1797,300 +1050,114 @@ connection default; "================== Step 8 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star user4 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_account; -user host event_name count_star -user1 localhost wait/io/file/sql/query_log 4 -======= -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 4 -======= -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 4 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 4 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_host; -host event_name count_star -localhost wait/io/file/sql/query_log 13 -======= -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 localhost wait/io/file/sql/query_log 22 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 3 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 6 -localhost wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 13 -======= wait/io/file/sql/query_log 22 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 13 -wait/synch/rwlock/sql/LOCK_grant 3 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 22 -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 0 user4 stage/sql/closing tables 0 user4 stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 stage/sql/Opening tables 0 user4 stage/sql/starting 0 execute dump_stages_host; host event_name count_star -<<<<<<< HEAD -localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 14 -localhost stage/sql/Init 15 -localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 10 -execute dump_stages_global; -event_name count_star -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 -======= localhost stage/sql/checking permissions 12 -localhost stage/sql/closing tables 18 -localhost stage/sql/init 12 -localhost stage/sql/Opening tables 18 +localhost stage/sql/closing tables 35 +localhost stage/sql/init 9 +localhost stage/sql/Opening tables 19 localhost stage/sql/starting 18 execute dump_stages_global; event_name count_star stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2192,329 +1259,131 @@ user4 1 1 execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS localhost 5 5 -<<<<<<< HEAD connection con4; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con4 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 9 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 4 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 4 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 4 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 4 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 16 -======= localhost wait/io/file/sql/query_log 28 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 16 -======= wait/io/file/sql/query_log 28 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 4 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 16 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 28 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 5 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 20 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 6 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 24 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 24 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2623,294 +1492,111 @@ call dump_thread(); username status user1 not found username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 4 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 4 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 4 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 4 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 17 -======= localhost wait/io/file/sql/query_log 29 -localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 17 -======= wait/io/file/sql/query_log 29 -wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 17 -======= wait/io/file/sql/query_log 29 -wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 5 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 21 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 6 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 25 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 25 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3022,280 +1708,108 @@ user1 not found username status user2 not found username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 5 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 4 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 5 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 4 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 4 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 18 -======= localhost wait/io/file/sql/query_log 30 -localhost wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 18 -======= wait/io/file/sql/query_log 30 -wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 18 -======= wait/io/file/sql/query_log 30 -wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 5 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 22 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 6 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 26 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 26 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3409,266 +1923,105 @@ user2 not found username status user3 not found username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 5 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 5 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 4 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 8 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 5 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 5 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 4 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 19 -======= localhost wait/io/file/sql/query_log 31 -localhost wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 19 -======= wait/io/file/sql/query_log 31 -wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 19 -======= wait/io/file/sql/query_log 31 -wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 5 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 23 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 6 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 6 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 27 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 27 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3785,251 +2138,101 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 5 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 5 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 5 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 8 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 8 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 5 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 5 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 5 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 8 -user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 20 -======= localhost wait/io/file/sql/query_log 32 -localhost wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4147,251 +2350,101 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 5 -======= user1 localhost wait/io/file/sql/query_log 8 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 5 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 5 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 5 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 8 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 8 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 8 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 5 -======= user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 5 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 5 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 5 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 8 -user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 20 -======= localhost wait/io/file/sql/query_log 32 -localhost wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4509,245 +2562,100 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_user; -user event_name count_star -user1 wait/io/file/sql/query_log 5 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 8 -user1 wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -user2 wait/io/file/sql/query_log 5 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 1 -user3 wait/io/file/sql/query_log 5 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 1 -user4 wait/io/file/sql/query_log 5 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 user2 wait/io/file/sql/query_log 8 -user2 wait/synch/mutex/sql/LOCK_connection_count 1 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 +user2 wait/synch/rwlock/sql/LOCK_grant 1 user3 wait/io/file/sql/query_log 8 -user3 wait/synch/mutex/sql/LOCK_connection_count 1 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 +user3 wait/synch/rwlock/sql/LOCK_grant 1 user4 wait/io/file/sql/query_log 8 -user4 wait/synch/mutex/sql/LOCK_connection_count 1 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_host; host event_name count_star -<<<<<<< HEAD -localhost wait/io/file/sql/query_log 20 -======= localhost wait/io/file/sql/query_log 32 -localhost wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4865,240 +2773,100 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -user4 wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_host; -host event_name count_star -localhost wait/io/file/sql/query_log 20 -======= -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 localhost wait/io/file/sql/query_log 32 -localhost wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -localhost wait/synch/mutex/sql/LOCK_user_locks 0 localhost wait/synch/rwlock/sql/LOCK_grant 4 -======= -localhost wait/synch/mutex/sql/LOCK_uuid_generator 8 -localhost wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5216,235 +2984,100 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -localhost wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_global; -event_name count_star -wait/io/file/sql/query_log 20 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5562,230 +3195,100 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5903,230 +3406,100 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -execute dump_stages_user; -user event_name count_star -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 7 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 7 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 7 user4 localhost stage/sql/checking permissions 4 -user4 localhost stage/sql/closing tables 6 -user4 localhost stage/sql/init 4 +user4 localhost stage/sql/closing tables 11 +user4 localhost stage/sql/init 3 user4 localhost stage/sql/Opening tables 6 user4 localhost stage/sql/starting 7 execute dump_stages_user; user event_name count_star user1 stage/sql/checking permissions 4 -user1 stage/sql/closing tables 6 -user1 stage/sql/init 4 -user1 stage/sql/Opening tables 6 +user1 stage/sql/closing tables 13 +user1 stage/sql/init 3 +user1 stage/sql/Opening tables 7 user1 stage/sql/starting 7 user2 stage/sql/checking permissions 4 -user2 stage/sql/closing tables 6 -user2 stage/sql/init 4 +user2 stage/sql/closing tables 11 +user2 stage/sql/init 3 user2 stage/sql/Opening tables 6 user2 stage/sql/starting 7 user3 stage/sql/checking permissions 4 -user3 stage/sql/closing tables 6 -user3 stage/sql/init 4 +user3 stage/sql/closing tables 11 +user3 stage/sql/init 3 user3 stage/sql/Opening tables 6 user3 stage/sql/starting 7 user4 stage/sql/checking permissions 4 -user4 stage/sql/closing tables 6 -user4 stage/sql/init 4 +user4 stage/sql/closing tables 11 +user4 stage/sql/init 3 user4 stage/sql/Opening tables 6 user4 stage/sql/starting 7 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6244,122 +3617,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -6374,96 +3666,51 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -<<<<<<< HEAD -user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 6 -user1 stage/sql/Init 6 -user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 4 -user2 stage/sql/Checking permissions 3 -user2 stage/sql/Closing tables 4 -user2 stage/sql/Init 6 -user2 stage/sql/Init for update 1 -user2 stage/sql/Opening tables 3 -user3 stage/sql/Checking permissions 3 -user3 stage/sql/Closing tables 4 -user3 stage/sql/Init 6 -user3 stage/sql/Init for update 1 -user3 stage/sql/Opening tables 3 -user4 stage/sql/Checking permissions 3 -user4 stage/sql/Closing tables 4 -user4 stage/sql/Init 6 -user4 stage/sql/Init for update 1 -user4 stage/sql/Opening tables 3 -execute dump_stages_host; -host event_name count_star -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= 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 execute dump_stages_host; host event_name count_star localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6581,122 +3828,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -6711,32 +3877,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -6751,52 +3899,29 @@ 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 -<<<<<<< HEAD -localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 18 -localhost stage/sql/Init 24 -localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 13 -execute dump_stages_global; -event_name count_star -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 -======= localhost stage/sql/checking permissions 16 -localhost stage/sql/closing tables 24 -localhost stage/sql/init 16 -localhost stage/sql/Opening tables 24 +localhost stage/sql/closing tables 46 +localhost stage/sql/init 12 +localhost stage/sql/Opening tables 25 localhost stage/sql/starting 28 execute dump_stages_global; event_name count_star stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6914,122 +4039,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -7044,32 +4088,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -7084,46 +4110,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -7241,122 +4250,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -7371,32 +4299,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -7411,40 +4321,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -7562,86 +4461,35 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -7703,9 +4551,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 @@ -7824,61 +4672,35 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -7940,9 +4762,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 @@ -8061,61 +4883,35 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8177,9 +4973,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 @@ -8298,61 +5094,35 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8414,9 +5184,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 @@ -8535,61 +5305,35 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -8651,9 +5395,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 @@ -8772,97 +5516,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -8877,32 +5565,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -8917,40 +5587,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -9068,122 +5727,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -9198,32 +5776,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -9238,40 +5798,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -9389,119 +5938,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -9516,32 +5987,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -9556,40 +6009,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -9707,119 +6149,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -9834,32 +6198,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -9874,40 +6220,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -10025,119 +6360,41 @@ user4 not found execute dump_waits_account; user host event_name count_star user1 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 -user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 0 user2 localhost wait/io/file/sql/query_log 0 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 user3 localhost wait/io/file/sql/query_log 0 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 user4 localhost wait/io/file/sql/query_log 0 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star user1 wait/io/file/sql/query_log 0 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -user1 wait/synch/rwlock/sql/LOCK_grant 0 -user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -user2 wait/synch/rwlock/sql/LOCK_grant 0 -user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_user_locks 0 -user3 wait/synch/rwlock/sql/LOCK_grant 0 -user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 user1 wait/synch/rwlock/sql/LOCK_grant 0 user2 wait/io/file/sql/query_log 0 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 user2 wait/synch/rwlock/sql/LOCK_grant 0 user3 wait/io/file/sql/query_log 0 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -user3 wait/synch/mutex/sql/LOCK_uuid_generator 0 user3 wait/synch/rwlock/sql/LOCK_grant 0 user4 wait/io/file/sql/query_log 0 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -user4 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -10152,32 +6409,14 @@ user3 localhost stage/sql/starting 0 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; user event_name count_star -user1 stage/sql/Checking permissions 0 -user1 stage/sql/Closing tables 0 -user1 stage/sql/Init 0 -user1 stage/sql/Init for update 0 +user1 stage/sql/checking permissions 0 +user1 stage/sql/closing tables 0 +user1 stage/sql/init 0 user1 stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 stage/sql/Checking permissions 0 -user2 stage/sql/Closing tables 0 -user2 stage/sql/Init 0 -user2 stage/sql/Init for update 0 -user2 stage/sql/Opening tables 0 -user3 stage/sql/Checking permissions 0 -user3 stage/sql/Closing tables 0 -user3 stage/sql/Init 0 -user3 stage/sql/Init for update 0 -user3 stage/sql/Opening tables 0 -user4 stage/sql/Checking permissions 0 -user4 stage/sql/Closing tables 0 -user4 stage/sql/Init 0 -user4 stage/sql/Init for update 0 -======= user1 stage/sql/starting 0 user2 stage/sql/checking permissions 0 user2 stage/sql/closing tables 0 @@ -10192,40 +6431,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -10345,90 +6573,33 @@ 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 localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star 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 @@ -10443,40 +6614,29 @@ 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 -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 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; @@ -10570,69 +6730,40 @@ user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> 258e16fa2de... WIP 5.7 P_S +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 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; @@ -10698,72 +6829,40 @@ user event_name count_star execute dump_waits_host; host event_name count_star localhost wait/io/file/sql/query_log 0 -<<<<<<< HEAD -localhost wait/synch/mutex/sql/LOCK_user_locks 0 -======= -localhost wait/synch/mutex/sql/LOCK_connection_count 0 -localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S localhost wait/synch/rwlock/sql/LOCK_grant 0 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 execute dump_stages_host; host event_name count_star -localhost stage/sql/Checking permissions 0 -localhost stage/sql/Closing tables 0 -localhost stage/sql/Init 0 -localhost stage/sql/Init for update 0 +localhost stage/sql/checking permissions 0 +localhost stage/sql/closing tables 0 +localhost stage/sql/init 0 localhost stage/sql/Opening tables 0 localhost stage/sql/starting 0 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; |