diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result')
-rw-r--r-- | mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result | 3137 |
1 files changed, 394 insertions, 2743 deletions
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result index d3943ebbff9..671125191f8 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result @@ -1,15 +1,3 @@ -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. "================== Step 1 ==================" call dump_thread(); username status @@ -29,12 +17,6 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) @@ -46,10 +28,9 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; @@ -93,12 +74,6 @@ connection default; call dump_thread(); username event_name count_star user1 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user1 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -user1 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user1 wait/synch/rwlock/sql/LOCK_grant 0 username status user2 not found @@ -109,12 +84,6 @@ 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 @@ -123,22 +92,15 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 1 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 1 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 user1 localhost stage/sql/starting 0 execute dump_stages_user; @@ -147,10 +109,9 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; @@ -195,45 +156,25 @@ execute dump_users; USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con1; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con1 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 3 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user2 not found username status @@ -242,95 +183,45 @@ 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 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 4 -======= wait/io/file/sql/query_log 7 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 1 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 7 -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -======= stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -380,27 +271,10 @@ connection default; "================== Step 4 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star user2 wait/io/file/sql/query_log 1 -<<<<<<< HEAD -user2 wait/synch/mutex/sql/LOCK_user_locks 0 -======= -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -user2 wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 wait/synch/rwlock/sql/LOCK_grant 0 username status user3 not found @@ -408,26 +282,9 @@ 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/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star @@ -435,50 +292,22 @@ execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 5 -======= wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 5 -wait/synch/rwlock/sql/LOCK_grant 1 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 8 -wait/synch/mutex/sql/LOCK_uuid_generator 2 -wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 user2 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user2 localhost stage/sql/Opening tables 0 user2 localhost stage/sql/starting 0 execute dump_stages_user; @@ -487,33 +316,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 3 -stage/sql/Closing tables 6 -stage/sql/Init 5 -stage/sql/Init for update 1 -stage/sql/Opening tables 4 -======= stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 4 -stage/sql/closing tables 6 -stage/sql/init 4 -stage/sql/Opening tables 6 +stage/sql/closing tables 13 +stage/sql/init 3 +stage/sql/Opening tables 7 stage/sql/starting 6 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -565,171 +379,80 @@ execute dump_users; USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con2; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con2 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 5 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user3 not found username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 8 -======= wait/io/file/sql/query_log 14 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 2 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 8 wait/synch/rwlock/sql/LOCK_grant 2 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 14 -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -======= stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -786,73 +509,23 @@ 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/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 localhost wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_user; user event_name count_star @@ -860,60 +533,27 @@ execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 9 -======= wait/io/file/sql/query_log 15 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 2 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 9 -wait/synch/rwlock/sql/LOCK_grant 2 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 15 -wait/synch/mutex/sql/LOCK_uuid_generator 4 -wait/synch/rwlock/sql/LOCK_grant 4 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 0 user3 localhost stage/sql/closing tables 0 user3 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user3 localhost stage/sql/Opening tables 0 user3 localhost stage/sql/starting 0 execute dump_stages_user; @@ -922,33 +562,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 6 -stage/sql/Closing tables 10 -stage/sql/Init 10 -stage/sql/Init for update 2 -stage/sql/Opening tables 7 -======= stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 8 -stage/sql/closing tables 12 -stage/sql/init 8 -stage/sql/Opening tables 12 +stage/sql/closing tables 24 +stage/sql/init 6 +stage/sql/Opening tables 13 stage/sql/starting 12 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1007,200 +632,88 @@ execute dump_users; USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con3; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con3 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 7 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 12 -======= wait/io/file/sql/query_log 21 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 3 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 12 wait/synch/rwlock/sql/LOCK_grant 3 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 21 -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -======= stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1264,92 +777,26 @@ 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/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 @@ -1357,70 +804,32 @@ execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 13 -======= wait/io/file/sql/query_log 22 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 3 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 13 -wait/synch/rwlock/sql/LOCK_grant 3 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 22 -wait/synch/mutex/sql/LOCK_uuid_generator 6 -wait/synch/rwlock/sql/LOCK_grant 6 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/checking permissions 4 -user1 localhost stage/sql/closing tables 6 -user1 localhost stage/sql/init 4 -user1 localhost stage/sql/Opening tables 6 +user1 localhost stage/sql/closing tables 13 +user1 localhost stage/sql/init 3 +user1 localhost stage/sql/Opening tables 7 user1 localhost stage/sql/starting 6 user2 localhost stage/sql/checking permissions 4 -user2 localhost stage/sql/closing tables 6 -user2 localhost stage/sql/init 4 +user2 localhost stage/sql/closing tables 11 +user2 localhost stage/sql/init 3 user2 localhost stage/sql/Opening tables 6 user2 localhost stage/sql/starting 6 user3 localhost stage/sql/checking permissions 4 -user3 localhost stage/sql/closing tables 6 -user3 localhost stage/sql/init 4 +user3 localhost stage/sql/closing tables 11 +user3 localhost stage/sql/init 3 user3 localhost stage/sql/Opening tables 6 user3 localhost stage/sql/starting 6 user4 localhost stage/sql/checking permissions 0 user4 localhost stage/sql/closing tables 0 user4 localhost stage/sql/init 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S user4 localhost stage/sql/Opening tables 0 user4 localhost stage/sql/starting 0 execute dump_stages_user; @@ -1429,33 +838,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 9 -stage/sql/Closing tables 14 -stage/sql/Init 15 -stage/sql/Init for update 3 -stage/sql/Opening tables 10 -======= stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 12 -stage/sql/closing tables 18 -stage/sql/init 12 -stage/sql/Opening tables 18 +stage/sql/closing tables 35 +stage/sql/init 9 +stage/sql/Opening tables 19 stage/sql/starting 18 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1521,229 +915,96 @@ execute dump_users; USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS execute dump_hosts; HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS -<<<<<<< HEAD connection con4; -select get_lock("marker", 10); -get_lock("marker", 10) -======= select uuid_short() <> 1; uuid_short() <> 1 ->>>>>>> merge-perfschema-5.7 1 select uuid_short() <> 1; uuid_short() <> 1 1 start transaction; insert into test.t1 values ("marker"); -<<<<<<< HEAD -connection default; -======= commit; select test.f(10,20); test.f(10,20) 30 -"================== con4 marker ==================" ->>>>>>> merge-perfschema-5.7 +connection default; "================== Step 9 ==================" call dump_thread(); username event_name count_star -<<<<<<< HEAD -user1 wait/io/file/sql/query_log 4 -======= user1 wait/io/file/sql/query_log 7 -user1 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 wait/synch/mutex/sql/LOCK_user_locks 0 user1 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 4 -======= user1 localhost wait/io/file/sql/query_log 7 -user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0 user1 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user2 localhost wait/io/file/sql/query_log 4 -user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user3 localhost wait/io/file/sql/query_log 4 -user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 -user4 localhost wait/io/file/sql/query_log 4 -user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 -======= -user1 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user1 localhost wait/synch/rwlock/sql/LOCK_grant 2 user2 localhost wait/io/file/sql/query_log 7 -user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user2 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user2 localhost wait/synch/rwlock/sql/LOCK_grant 1 user3 localhost wait/io/file/sql/query_log 7 -user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user3 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 localhost wait/synch/rwlock/sql/LOCK_grant 2 +user3 localhost wait/synch/rwlock/sql/LOCK_grant 1 user4 localhost wait/io/file/sql/query_log 7 -user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0 -user4 localhost wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 localhost wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 +user4 localhost wait/synch/rwlock/sql/LOCK_grant 1 execute dump_waits_user; user event_name count_star execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 16 -======= wait/io/file/sql/query_log 28 -wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 execute dump_waits_history; event_name count(event_name) -wait/io/file/sql/query_log 16 -wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 -execute dump_waits_history; -event_name count(event_name) wait/io/file/sql/query_log 28 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 5 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 20 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 20 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 24 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 24 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1816,194 +1077,76 @@ call dump_thread(); username status user1 not found username event_name count_star -<<<<<<< HEAD -user2 wait/io/file/sql/query_log 4 -======= user2 wait/io/file/sql/query_log 7 -user2 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user2 wait/synch/mutex/sql/LOCK_user_locks 0 user2 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user2 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user2 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< 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 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 17 -======= wait/io/file/sql/query_log 29 -wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 17 -======= wait/io/file/sql/query_log 29 -wait/synch/mutex/sql/LOCK_connection_count 1 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 5 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 21 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 21 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 25 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 25 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2079,180 +1222,73 @@ user1 not found username status user2 not found username event_name count_star -<<<<<<< HEAD -user3 wait/io/file/sql/query_log 4 -======= user3 wait/io/file/sql/query_log 7 -user3 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user3 wait/synch/mutex/sql/LOCK_user_locks 0 user3 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user3 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user3 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< 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 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 18 -======= wait/io/file/sql/query_log 30 -wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 18 -======= wait/io/file/sql/query_log 30 -wait/synch/mutex/sql/LOCK_connection_count 2 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 5 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 22 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 22 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 26 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 26 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2330,166 +1366,70 @@ user2 not found username status user3 not found username event_name count_star -<<<<<<< HEAD -user4 wait/io/file/sql/query_log 4 -======= user4 wait/io/file/sql/query_log 7 -user4 wait/synch/mutex/sql/LOCK_connection_count 0 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -user4 wait/synch/mutex/sql/LOCK_user_locks 0 user4 wait/synch/rwlock/sql/LOCK_grant 1 -======= -user4 wait/synch/mutex/sql/LOCK_uuid_generator 2 -user4 wait/synch/rwlock/sql/LOCK_grant 2 ->>>>>>> merge-perfschema-5.7 execute dump_waits_account; user host event_name count_star -<<<<<<< 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 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 19 -======= wait/io/file/sql/query_log 31 -wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 19 -======= wait/io/file/sql/query_log 31 -wait/synch/mutex/sql/LOCK_connection_count 3 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 5 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 23 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 23 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 27 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 27 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2570,151 +1510,66 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 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 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2796,151 +1651,66 @@ username status user4 not found execute dump_waits_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost wait/io/file/sql/query_log 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 execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3022,33 +1792,12 @@ 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 @@ -3056,111 +1805,52 @@ execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3242,33 +1932,12 @@ 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 @@ -3276,111 +1945,52 @@ execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3462,33 +2072,12 @@ 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 @@ -3496,111 +2085,52 @@ execute dump_waits_host; host event_name count_star execute dump_waits_global; event_name count_star -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S -wait/synch/mutex/sql/LOCK_user_locks 0 wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_waits_history; event_name count(event_name) -<<<<<<< HEAD -wait/io/file/sql/query_log 20 -======= wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3682,33 +2212,12 @@ 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 @@ -3717,105 +2226,51 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3897,33 +2352,12 @@ 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 @@ -3932,105 +2366,51 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -<<<<<<< HEAD -user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 6 -user1 localhost stage/sql/Init 6 -user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 4 -user2 localhost stage/sql/Checking permissions 3 -user2 localhost stage/sql/Closing tables 4 -user2 localhost stage/sql/Init 6 -user2 localhost stage/sql/Init for update 1 -user2 localhost stage/sql/Opening tables 3 -user3 localhost stage/sql/Checking permissions 3 -user3 localhost stage/sql/Closing tables 4 -user3 localhost stage/sql/Init 6 -user3 localhost stage/sql/Init for update 1 -user3 localhost stage/sql/Opening tables 3 -user4 localhost stage/sql/Checking permissions 3 -user4 localhost stage/sql/Closing tables 4 -user4 localhost stage/sql/Init 6 -user4 localhost stage/sql/Init for update 1 -user4 localhost stage/sql/Opening tables 3 -======= 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 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4112,33 +2492,12 @@ 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 @@ -4147,50 +2506,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -4205,7 +2531,6 @@ 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; @@ -4214,33 +2539,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4322,33 +2632,12 @@ 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 @@ -4357,50 +2646,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -4415,7 +2671,6 @@ 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; @@ -4424,33 +2679,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4532,33 +2772,12 @@ 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 @@ -4567,50 +2786,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -4625,7 +2811,6 @@ 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; @@ -4634,33 +2819,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -execute dump_stages_history; -event_name count(event_name) -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4742,33 +2912,12 @@ 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 @@ -4777,50 +2926,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -4835,7 +2951,6 @@ 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; @@ -4844,27 +2959,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4946,33 +3052,12 @@ 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 @@ -4981,50 +3066,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -5039,7 +3091,6 @@ 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; @@ -5048,27 +3099,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5150,33 +3192,12 @@ 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 @@ -5185,50 +3206,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -5243,7 +3231,6 @@ 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; @@ -5252,27 +3239,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5354,33 +3332,12 @@ 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 @@ -5389,50 +3346,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -5447,7 +3371,6 @@ 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; @@ -5456,27 +3379,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5558,33 +3472,12 @@ 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 @@ -5593,50 +3486,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -5651,7 +3511,6 @@ 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; @@ -5660,27 +3519,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5762,33 +3612,12 @@ 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 @@ -5797,50 +3626,17 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star -user1 localhost stage/sql/Checking permissions 0 -user1 localhost stage/sql/Closing tables 0 -user1 localhost stage/sql/Init 0 -user1 localhost stage/sql/Init for update 0 +user1 localhost stage/sql/checking permissions 0 +user1 localhost stage/sql/closing tables 0 +user1 localhost stage/sql/init 0 user1 localhost stage/sql/Opening tables 0 -<<<<<<< HEAD -user2 localhost stage/sql/Checking permissions 0 -user2 localhost stage/sql/Closing tables 0 -user2 localhost stage/sql/Init 0 -user2 localhost stage/sql/Init for update 0 -user2 localhost stage/sql/Opening tables 0 -user3 localhost stage/sql/Checking permissions 0 -user3 localhost stage/sql/Closing tables 0 -user3 localhost stage/sql/Init 0 -user3 localhost stage/sql/Init for update 0 -user3 localhost stage/sql/Opening tables 0 -user4 localhost stage/sql/Checking permissions 0 -user4 localhost stage/sql/Closing tables 0 -user4 localhost stage/sql/Init 0 -user4 localhost stage/sql/Init for update 0 -======= user1 localhost stage/sql/starting 0 user2 localhost stage/sql/checking permissions 0 user2 localhost stage/sql/closing tables 0 @@ -5855,7 +3651,6 @@ 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; @@ -5864,27 +3659,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5966,20 +3752,12 @@ 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 @@ -5988,27 +3766,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -6037,27 +3799,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6139,20 +3892,12 @@ 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 @@ -6161,27 +3906,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -6210,27 +3939,18 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -6312,20 +4032,12 @@ 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 @@ -6334,27 +4046,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -<<<<<<< HEAD -wait/synch/mutex/sql/LOCK_user_locks 0 -wait/synch/rwlock/sql/LOCK_grant 0 -execute dump_waits_history; -event_name count(event_name) -wait/io/file/sql/query_log 20 -======= -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -<<<<<<< HEAD ->>>>>>> 258e16fa2de... WIP 5.7 P_S wait/synch/rwlock/sql/LOCK_grant 4 -======= -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 ->>>>>>> merge-perfschema-5.7 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -6383,25 +4079,17 @@ execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star -stage/sql/Checking permissions 0 -stage/sql/Closing tables 0 -stage/sql/Init 0 -stage/sql/Init for update 0 +stage/sql/checking permissions 0 +stage/sql/closing tables 0 +stage/sql/init 0 stage/sql/Opening tables 0 stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) -<<<<<<< HEAD -stage/sql/Checking permissions 12 -stage/sql/Closing tables 18 -stage/sql/Init 24 -stage/sql/Init for update 4 -stage/sql/Opening tables 13 -======= stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6484,20 +4172,12 @@ 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 @@ -6506,15 +4186,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -6551,9 +4227,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 @@ -6636,20 +4312,12 @@ 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 @@ -6658,15 +4326,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/checking permissions 0 @@ -6703,9 +4367,9 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 execute dump_statements_account; user host event_name count_star @@ -6794,15 +4458,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -6819,9 +4479,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 @@ -6882,15 +4542,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -6907,9 +4563,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 @@ -6970,15 +4626,11 @@ host event_name count_star execute dump_waits_global; event_name count_star wait/io/file/sql/query_log 0 -wait/synch/mutex/sql/LOCK_connection_count 0 -wait/synch/mutex/sql/LOCK_uuid_generator 0 wait/synch/rwlock/sql/LOCK_grant 0 execute dump_waits_history; event_name count(event_name) wait/io/file/sql/query_log 32 -wait/synch/mutex/sql/LOCK_connection_count 4 -wait/synch/mutex/sql/LOCK_uuid_generator 8 -wait/synch/rwlock/sql/LOCK_grant 8 +wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star execute dump_stages_user; @@ -6995,11 +4647,10 @@ stage/sql/starting 0 execute dump_stages_history; event_name count(event_name) stage/sql/checking permissions 16 -stage/sql/closing tables 24 -stage/sql/init 16 -stage/sql/Opening tables 24 +stage/sql/closing tables 46 +stage/sql/init 12 +stage/sql/Opening tables 25 stage/sql/starting 28 ->>>>>>> 258e16fa2de... WIP 5.7 P_S execute dump_statements_account; user host event_name count_star execute dump_statements_user; |