summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/perfschema/r/event_aggregate_no_a.result')
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a.result4429
1 files changed, 4260 insertions, 169 deletions
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
index 32bf988e63a..e3acb02e4e3 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -1,3 +1,15 @@
+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
@@ -15,12 +27,22 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
@@ -35,6 +57,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -42,6 +65,7 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 0
stage/sql/Opening tables 0
+stage/sql/starting 0
execute dump_stages_history;
event_name count(event_name)
execute dump_statements_account;
@@ -52,16 +76,30 @@ execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 0
statement/sql/insert 0
statement/sql/select 0
execute dump_statements_history;
event_name count(event_name)
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 0
+execute dump_transactions_history;
+event_name count(event_name)
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -76,7 +114,12 @@ 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
@@ -89,17 +132,32 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 1
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 1
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
@@ -113,6 +171,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+user1 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -120,6 +179,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -127,6 +187,7 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 0
stage/sql/Opening tables 0
+stage/sql/starting 0
execute dump_stages_history;
event_name count(event_name)
execute dump_statements_account;
@@ -135,22 +196,38 @@ execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
user1 statement/sql/insert 0
user1 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 0
statement/sql/insert 0
statement/sql/select 0
execute dump_statements_history;
event_name count(event_name)
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 0
+execute dump_transactions_history;
+event_name count(event_name)
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -160,21 +237,45 @@ user1 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 2 2
+<<<<<<< HEAD
connection con1;
select get_lock("marker", 10);
get_lock("marker", 10)
+=======
+select uuid_short() <> 1;
+uuid_short() <> 1
+>>>>>>> merge-perfschema-5.7
1
-select release_lock("marker");
-release_lock("marker")
+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
"================== 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
@@ -185,27 +286,63 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 4
+=======
+localhost wait/io/file/sql/query_log 7
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 2
+localhost wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 4
+=======
+wait/io/file/sql/query_log 7
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 4
wait/synch/rwlock/sql/LOCK_grant 1
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 2
+wait/synch/rwlock/sql/LOCK_grant 2
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 7
+wait/synch/mutex/sql/LOCK_uuid_generator 2
+wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -232,30 +369,76 @@ stage/sql/Closing tables 6
stage/sql/Init 5
stage/sql/Init for update 1
stage/sql/Opening tables 4
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 4
+localhost stage/sql/closing tables 6
+localhost stage/sql/init 4
+localhost stage/sql/Opening tables 6
+localhost stage/sql/starting 6
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 4
+stage/sql/closing tables 6
+stage/sql/init 4
+stage/sql/Opening tables 6
+stage/sql/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/starting 6
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 1
localhost statement/sql/insert 1
-localhost statement/sql/select 2
+localhost statement/sql/select 3
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 1
statement/sql/insert 1
-statement/sql/select 2
+statement/sql/select 3
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 1
statement/sql/insert 1
-statement/sql/select 2
+statement/sql/select 3
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 1
+execute dump_transactions_global;
+event_name count_star
+transaction 1
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 1
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -270,12 +453,27 @@ 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
@@ -285,30 +483,71 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
user2 wait/io/file/sql/query_log 1
+<<<<<<< HEAD
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
+=======
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 8
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 2
+localhost wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 5
+=======
+wait/io/file/sql/query_log 8
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 5
wait/synch/rwlock/sql/LOCK_grant 1
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 2
+wait/synch/rwlock/sql/LOCK_grant 2
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 8
+wait/synch/mutex/sql/LOCK_uuid_generator 2
+wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -318,9 +557,21 @@ user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
user2 stage/sql/Init for update 0
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
+<<<<<<< HEAD
localhost stage/sql/Checking permissions 3
localhost stage/sql/Closing tables 6
localhost stage/sql/Init 5
@@ -340,34 +591,75 @@ stage/sql/Closing tables 6
stage/sql/Init 5
stage/sql/Init for update 1
stage/sql/Opening tables 4
+=======
+localhost stage/sql/checking permissions 4
+localhost stage/sql/closing tables 6
+localhost stage/sql/init 4
+localhost stage/sql/Opening tables 6
+localhost stage/sql/starting 6
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 4
+stage/sql/closing tables 6
+stage/sql/init 4
+stage/sql/Opening tables 6
+stage/sql/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/starting 6
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
user2 statement/sql/insert 0
user2 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 1
localhost statement/sql/insert 1
-localhost statement/sql/select 2
+localhost statement/sql/select 3
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 1
statement/sql/insert 1
-statement/sql/select 2
+statement/sql/select 3
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 1
statement/sql/insert 1
-statement/sql/select 2
+statement/sql/select 3
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 1
+execute dump_transactions_global;
+event_name count_star
+transaction 1
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 1
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -378,25 +670,59 @@ user2 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 3 3
+<<<<<<< HEAD
connection con2;
select get_lock("marker", 10);
get_lock("marker", 10)
+=======
+select uuid_short() <> 1;
+uuid_short() <> 1
+>>>>>>> merge-perfschema-5.7
1
-select release_lock("marker");
-release_lock("marker")
+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
"================== 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
@@ -405,30 +731,70 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 8
+=======
+localhost wait/io/file/sql/query_log 14
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 4
+localhost wait/synch/rwlock/sql/LOCK_grant 4
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 8
+=======
+wait/io/file/sql/query_log 14
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 8
wait/synch/rwlock/sql/LOCK_grant 2
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 4
+wait/synch/rwlock/sql/LOCK_grant 4
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 14
+wait/synch/mutex/sql/LOCK_uuid_generator 4
+wait/synch/rwlock/sql/LOCK_grant 4
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -460,34 +826,87 @@ stage/sql/Closing tables 10
stage/sql/Init 10
stage/sql/Init for update 2
stage/sql/Opening tables 7
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 8
+localhost stage/sql/closing tables 12
+localhost stage/sql/init 8
+localhost stage/sql/Opening tables 12
+localhost stage/sql/starting 12
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 8
+stage/sql/closing tables 12
+stage/sql/init 8
+stage/sql/Opening tables 12
+stage/sql/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/starting 12
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 2
localhost statement/sql/insert 2
-localhost statement/sql/select 4
+localhost statement/sql/select 6
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 2
statement/sql/insert 2
-statement/sql/select 4
+statement/sql/select 6
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 2
statement/sql/insert 2
-statement/sql/select 4
+statement/sql/select 6
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 2
+execute dump_transactions_global;
+event_name count_star
+transaction 2
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 2
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -503,16 +922,41 @@ 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
@@ -520,33 +964,78 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
user3 wait/io/file/sql/query_log 1
+<<<<<<< HEAD
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
+=======
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 15
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 4
+localhost wait/synch/rwlock/sql/LOCK_grant 4
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 9
+=======
+wait/io/file/sql/query_log 15
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 9
wait/synch/rwlock/sql/LOCK_grant 2
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 4
+wait/synch/rwlock/sql/LOCK_grant 4
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 15
+wait/synch/mutex/sql/LOCK_uuid_generator 4
+wait/synch/rwlock/sql/LOCK_grant 4
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -561,9 +1050,26 @@ user3 stage/sql/Checking permissions 0
user3 stage/sql/Closing tables 0
user3 stage/sql/Init 0
user3 stage/sql/Init for update 0
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 6
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
+<<<<<<< HEAD
localhost stage/sql/Checking permissions 6
localhost stage/sql/Closing tables 10
localhost stage/sql/Init 10
@@ -583,38 +1089,81 @@ stage/sql/Closing tables 10
stage/sql/Init 10
stage/sql/Init for update 2
stage/sql/Opening tables 7
+=======
+localhost stage/sql/checking permissions 8
+localhost stage/sql/closing tables 12
+localhost stage/sql/init 8
+localhost stage/sql/Opening tables 12
+localhost stage/sql/starting 12
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 8
+stage/sql/closing tables 12
+stage/sql/init 8
+stage/sql/Opening tables 12
+stage/sql/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/starting 12
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
user3 statement/sql/insert 0
user3 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 2
localhost statement/sql/insert 2
-localhost statement/sql/select 4
+localhost statement/sql/select 6
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 2
statement/sql/insert 2
-statement/sql/select 4
+statement/sql/select 6
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 2
statement/sql/insert 2
-statement/sql/select 4
+statement/sql/select 6
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 2
+execute dump_transactions_global;
+event_name count_star
+transaction 2
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 2
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -626,36 +1175,86 @@ user3 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 4 4
+<<<<<<< HEAD
connection con3;
select get_lock("marker", 10);
get_lock("marker", 10)
+=======
+select uuid_short() <> 1;
+uuid_short() <> 1
+>>>>>>> merge-perfschema-5.7
1
-select release_lock("marker");
-release_lock("marker")
+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
"================== Step 7 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user2 wait/io/file/sql/query_log 4
+=======
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user3 wait/io/file/sql/query_log 4
+=======
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username status
user4 not found
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
@@ -664,24 +1263,62 @@ user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 12
+=======
+localhost wait/io/file/sql/query_log 21
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 6
+localhost wait/synch/rwlock/sql/LOCK_grant 6
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 12
+=======
+wait/io/file/sql/query_log 21
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 12
wait/synch/rwlock/sql/LOCK_grant 3
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 6
+wait/synch/rwlock/sql/LOCK_grant 6
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 21
+wait/synch/mutex/sql/LOCK_uuid_generator 6
+wait/synch/rwlock/sql/LOCK_grant 6
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -718,38 +1355,98 @@ stage/sql/Closing tables 14
stage/sql/Init 15
stage/sql/Init for update 3
stage/sql/Opening tables 10
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 6
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 12
+localhost stage/sql/closing tables 18
+localhost stage/sql/init 12
+localhost stage/sql/Opening tables 18
+localhost stage/sql/starting 18
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 12
+stage/sql/closing tables 18
+stage/sql/init 12
+stage/sql/Opening tables 18
+stage/sql/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/starting 18
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 3
localhost statement/sql/insert 3
-localhost statement/sql/select 6
+localhost statement/sql/select 9
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 3
statement/sql/insert 3
-statement/sql/select 6
+statement/sql/select 9
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 3
statement/sql/insert 3
-statement/sql/select 6
+statement/sql/select 9
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 3
+execute dump_transactions_global;
+event_name count_star
+transaction 3
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 3
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -766,26 +1463,67 @@ connection default;
"================== Step 8 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user2 wait/io/file/sql/query_log 4
+=======
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user3 wait/io/file/sql/query_log 4
+=======
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
user4 wait/io/file/sql/query_log 1
+<<<<<<< HEAD
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
@@ -794,27 +1532,70 @@ user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
user4 wait/io/file/sql/query_log 1
+<<<<<<< HEAD
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
+=======
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 22
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 6
+localhost wait/synch/rwlock/sql/LOCK_grant 6
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 13
+=======
+wait/io/file/sql/query_log 22
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 13
wait/synch/rwlock/sql/LOCK_grant 3
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 6
+wait/synch/rwlock/sql/LOCK_grant 6
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 22
+wait/synch/mutex/sql/LOCK_uuid_generator 6
+wait/synch/rwlock/sql/LOCK_grant 6
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -834,9 +1615,31 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 6
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 6
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
+<<<<<<< HEAD
localhost stage/sql/Checking permissions 9
localhost stage/sql/Closing tables 14
localhost stage/sql/Init 15
@@ -856,42 +1659,87 @@ stage/sql/Closing tables 14
stage/sql/Init 15
stage/sql/Init for update 3
stage/sql/Opening tables 10
+=======
+localhost stage/sql/checking permissions 12
+localhost stage/sql/closing tables 18
+localhost stage/sql/init 12
+localhost stage/sql/Opening tables 18
+localhost stage/sql/starting 18
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 12
+stage/sql/closing tables 18
+stage/sql/init 12
+stage/sql/Opening tables 18
+stage/sql/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/starting 18
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
user4 statement/sql/insert 0
user4 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 3
localhost statement/sql/insert 3
-localhost statement/sql/select 6
+localhost statement/sql/select 9
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 3
statement/sql/insert 3
-statement/sql/select 6
+statement/sql/select 9
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 3
statement/sql/insert 3
-statement/sql/select 6
+statement/sql/select 9
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 3
+execute dump_transactions_global;
+event_name count_star
+transaction 3
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 3
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -904,38 +1752,98 @@ user4 1 1
execute dump_hosts;
HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 5 5
+<<<<<<< HEAD
connection con4;
select get_lock("marker", 10);
get_lock("marker", 10)
+=======
+select uuid_short() <> 1;
+uuid_short() <> 1
+>>>>>>> merge-perfschema-5.7
1
-select release_lock("marker");
-release_lock("marker")
+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
"================== Step 9 =================="
call dump_thread();
username event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user2 wait/io/file/sql/query_log 4
+=======
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user3 wait/io/file/sql/query_log 4
+=======
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user4 wait/io/file/sql/query_log 4
+=======
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 4
+=======
+user1 wait/io/file/sql/query_log 7
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
@@ -947,24 +1855,66 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 16
+=======
+localhost wait/io/file/sql/query_log 28
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 16
+=======
+wait/io/file/sql/query_log 28
+wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 16
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 28
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 5
@@ -1006,42 +1956,109 @@ stage/sql/Closing tables 18
stage/sql/Init 20
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 6
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 6
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 6
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 24
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 24
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1061,22 +2078,58 @@ call dump_thread();
username status
user1 not found
username event_name count_star
+<<<<<<< HEAD
user2 wait/io/file/sql/query_log 4
+=======
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user3 wait/io/file/sql/query_log 4
+=======
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user4 wait/io/file/sql/query_log 4
+=======
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 5
+=======
+user1 wait/io/file/sql/query_log 8
+user1 wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
@@ -1088,24 +2141,71 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 7
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 17
+=======
+localhost wait/io/file/sql/query_log 29
+localhost wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 17
+=======
+wait/io/file/sql/query_log 29
+wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 17
+=======
+wait/io/file/sql/query_log 29
+wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1147,43 +2247,110 @@ stage/sql/Closing tables 18
stage/sql/Init 21
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 6
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 6
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 25
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 25
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 1
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 1
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 1
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1205,18 +2372,44 @@ user1 not found
username status
user2 not found
username event_name count_star
+<<<<<<< HEAD
user3 wait/io/file/sql/query_log 4
+=======
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
username event_name count_star
+<<<<<<< HEAD
user4 wait/io/file/sql/query_log 4
+=======
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 5
+=======
+user1 wait/io/file/sql/query_log 8
+user1 wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
@@ -1228,24 +2421,71 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 8
+user2 wait/synch/mutex/sql/LOCK_connection_count 1
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 7
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 18
+=======
+localhost wait/io/file/sql/query_log 30
+localhost wait/synch/mutex/sql/LOCK_connection_count 2
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 18
+=======
+wait/io/file/sql/query_log 30
+wait/synch/mutex/sql/LOCK_connection_count 2
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 18
+=======
+wait/io/file/sql/query_log 30
+wait/synch/mutex/sql/LOCK_connection_count 2
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1287,43 +2527,110 @@ stage/sql/Closing tables 18
stage/sql/Init 22
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 6
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 26
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 26
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 2
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 2
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 2
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1347,14 +2654,30 @@ user2 not found
username status
user3 not found
username event_name count_star
+<<<<<<< HEAD
user4 wait/io/file/sql/query_log 4
+=======
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 5
+=======
+user1 wait/io/file/sql/query_log 8
+user1 wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
@@ -1366,24 +2689,71 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 8
+user2 wait/synch/mutex/sql/LOCK_connection_count 1
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 8
+user3 wait/synch/mutex/sql/LOCK_connection_count 1
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 7
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 19
+=======
+localhost wait/io/file/sql/query_log 31
+localhost wait/synch/mutex/sql/LOCK_connection_count 3
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 19
+=======
+wait/io/file/sql/query_log 31
+wait/synch/mutex/sql/LOCK_connection_count 3
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 19
+=======
+wait/io/file/sql/query_log 31
+wait/synch/mutex/sql/LOCK_connection_count 3
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1425,43 +2795,110 @@ stage/sql/Closing tables 18
stage/sql/Init 23
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 6
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 27
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 27
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 3
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 3
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 3
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1490,7 +2927,13 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 5
+=======
+user1 wait/io/file/sql/query_log 8
+user1 wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
@@ -1502,24 +2945,71 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 8
+user2 wait/synch/mutex/sql/LOCK_connection_count 1
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 8
+user3 wait/synch/mutex/sql/LOCK_connection_count 1
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 8
+user4 wait/synch/mutex/sql/LOCK_connection_count 1
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 20
+=======
+localhost wait/io/file/sql/query_log 32
+localhost wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1561,43 +3051,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1627,7 +3184,13 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 5
+=======
+user1 wait/io/file/sql/query_log 8
+user1 wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
@@ -1639,24 +3202,71 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 8
+user2 wait/synch/mutex/sql/LOCK_connection_count 1
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 8
+user3 wait/synch/mutex/sql/LOCK_connection_count 1
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 8
+user4 wait/synch/mutex/sql/LOCK_connection_count 1
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 20
+=======
+localhost wait/io/file/sql/query_log 32
+localhost wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1698,43 +3308,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1763,7 +3440,13 @@ execute dump_waits_account;
user host event_name count_star
execute dump_waits_user;
user event_name count_star
+<<<<<<< HEAD
user1 wait/io/file/sql/query_log 5
+=======
+user1 wait/io/file/sql/query_log 8
+user1 wait/synch/mutex/sql/LOCK_connection_count 1
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
@@ -1775,24 +3458,71 @@ user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
+=======
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user1 wait/synch/rwlock/sql/LOCK_grant 2
+user2 wait/io/file/sql/query_log 8
+user2 wait/synch/mutex/sql/LOCK_connection_count 1
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user2 wait/synch/rwlock/sql/LOCK_grant 2
+user3 wait/io/file/sql/query_log 8
+user3 wait/synch/mutex/sql/LOCK_connection_count 1
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user3 wait/synch/rwlock/sql/LOCK_grant 2
+user4 wait/io/file/sql/query_log 8
+user4 wait/synch/mutex/sql/LOCK_connection_count 1
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 2
+user4 wait/synch/rwlock/sql/LOCK_grant 2
+>>>>>>> merge-perfschema-5.7
execute dump_waits_host;
host event_name count_star
+<<<<<<< HEAD
localhost wait/io/file/sql/query_log 20
+=======
+localhost wait/io/file/sql/query_log 32
+localhost wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1834,43 +3564,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -1900,6 +3697,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -1914,21 +3712,68 @@ user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 32
+localhost wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
+=======
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 8
+localhost wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_global;
event_name count_star
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -1970,43 +3815,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2036,6 +3948,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2046,25 +3959,67 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+localhost wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_global;
+event_name count_star
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_waits_history;
event_name count(event_name)
+<<<<<<< HEAD
wait/io/file/sql/query_log 20
+=======
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -2106,43 +4061,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2172,6 +4194,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2182,25 +4205,62 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -2242,43 +4302,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2308,6 +4435,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2318,25 +4446,62 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -2378,43 +4543,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2444,6 +4676,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2454,25 +4687,62 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
user event_name count_star
+<<<<<<< HEAD
user1 stage/sql/Checking permissions 3
user1 stage/sql/Closing tables 6
user1 stage/sql/Init 6
@@ -2514,43 +4784,110 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+user1 stage/sql/checking permissions 4
+user1 stage/sql/closing tables 6
+user1 stage/sql/init 4
+user1 stage/sql/Opening tables 6
+user1 stage/sql/starting 7
+user2 stage/sql/checking permissions 4
+user2 stage/sql/closing tables 6
+user2 stage/sql/init 4
+user2 stage/sql/Opening tables 6
+user2 stage/sql/starting 7
+user3 stage/sql/checking permissions 4
+user3 stage/sql/closing tables 6
+user3 stage/sql/init 4
+user3 stage/sql/Opening tables 6
+user3 stage/sql/starting 7
+user4 stage/sql/checking permissions 4
+user4 stage/sql/closing tables 6
+user4 stage/sql/init 4
+user4 stage/sql/Opening tables 6
+user4 stage/sql/starting 7
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2580,6 +4917,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2590,21 +4928,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2614,6 +4988,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -2628,9 +5003,27 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
+<<<<<<< HEAD
localhost stage/sql/Checking permissions 12
localhost stage/sql/Closing tables 18
localhost stage/sql/Init 24
@@ -2650,43 +5043,88 @@ stage/sql/Closing tables 18
stage/sql/Init 24
stage/sql/Init for update 4
stage/sql/Opening tables 13
+=======
+localhost stage/sql/checking permissions 16
+localhost stage/sql/closing tables 24
+localhost stage/sql/init 16
+localhost stage/sql/Opening tables 24
+localhost stage/sql/starting 28
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 16
+stage/sql/closing tables 24
+stage/sql/init 16
+stage/sql/Opening tables 24
+stage/sql/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2716,6 +5154,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2726,21 +5165,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2750,6 +5225,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -2764,7 +5240,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -2772,8 +5265,10 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
+<<<<<<< HEAD
stage/sql/Checking permissions 12
stage/sql/Closing tables 18
stage/sql/Init 24
@@ -2786,43 +5281,81 @@ 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/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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2852,6 +5385,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2862,21 +5396,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -2886,6 +5456,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -2900,7 +5471,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -2908,6 +5496,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -2915,50 +5504,83 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -2988,6 +5610,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -2998,21 +5621,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3022,6 +5681,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -3036,7 +5696,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -3044,6 +5721,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3051,50 +5729,83 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3124,6 +5835,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -3134,21 +5846,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3158,6 +5906,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -3172,7 +5921,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -3180,6 +5946,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3187,50 +5954,83 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 1
+user1 statement/sp/freturn 1
user1 statement/sql/insert 1
-user1 statement/sql/select 2
+user1 statement/sql/select 3
user2 statement/com/Error 0
user2 statement/com/Quit 1
+user2 statement/sp/freturn 1
user2 statement/sql/insert 1
-user2 statement/sql/select 2
+user2 statement/sql/select 3
user3 statement/com/Error 0
user3 statement/com/Quit 1
+user3 statement/sp/freturn 1
user3 statement/sql/insert 1
-user3 statement/sql/select 2
+user3 statement/sql/select 3
user4 statement/com/Error 0
user4 statement/com/Quit 1
+user4 statement/sp/freturn 1
user4 statement/sql/insert 1
-user4 statement/sql/select 2
+user4 statement/sql/select 3
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3260,6 +6060,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -3270,21 +6071,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3294,6 +6131,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -3308,7 +6146,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -3316,6 +6171,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3323,50 +6179,83 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
user1 statement/sql/insert 0
user1 statement/sql/select 0
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
user2 statement/sql/insert 0
user2 statement/sql/select 0
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
user3 statement/sql/insert 0
user3 statement/sql/select 0
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
user4 statement/sql/insert 0
user4 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 4
+localhost statement/sp/freturn 4
localhost statement/sql/insert 4
-localhost statement/sql/select 8
+localhost statement/sql/select 12
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3396,6 +6285,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -3406,21 +6296,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3430,6 +6356,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -3444,7 +6371,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -3452,6 +6396,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3459,50 +6404,83 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
user1 statement/sql/insert 0
user1 statement/sql/select 0
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
user2 statement/sql/insert 0
user2 statement/sql/select 0
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
user3 statement/sql/insert 0
user3 statement/sql/select 0
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
user4 statement/sql/insert 0
user4 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3532,6 +6510,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -3542,21 +6521,57 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3566,6 +6581,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -3580,7 +6596,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -3588,6 +6621,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3595,50 +6629,935 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
+execute dump_statements_account;
+user host event_name count_star
+execute dump_statements_user;
+user event_name count_star
+user1 statement/com/Error 0
+user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
+user1 statement/sql/insert 0
+user1 statement/sql/select 0
+user2 statement/com/Error 0
+user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
+user2 statement/sql/insert 0
+user2 statement/sql/select 0
+user3 statement/com/Error 0
+user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
+user3 statement/sql/insert 0
+user3 statement/sql/select 0
+user4 statement/com/Error 0
+user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
+user4 statement/sql/insert 0
+user4 statement/sql/select 0
+execute dump_statements_host;
+host event_name count_star
+localhost statement/com/Error 0
+localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
+localhost statement/sql/insert 0
+localhost statement/sql/select 0
+execute dump_statements_global;
+event_name count_star
+statement/com/Error 0
+statement/com/Quit 0
+statement/sp/freturn 0
+statement/sql/insert 0
+statement/sql/select 0
+execute dump_statements_history;
+event_name count(event_name)
+statement/com/Quit 4
+statement/sp/freturn 4
+statement/sql/insert 4
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
+execute dump_accounts;
+USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+execute dump_users;
+USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+root 1 1
+user1 0 1
+user2 0 1
+user3 0 1
+user4 0 1
+execute dump_hosts;
+HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+localhost 1 5
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username status
+user1 not found
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/file/sql/query_log 0
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 0
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+localhost wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_global;
+event_name count_star
+wait/io/file/sql/query_log 0
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
+execute dump_stages_account;
+user host event_name count_star
+execute dump_stages_user;
+user event_name count_star
+user1 stage/sql/checking permissions 0
+user1 stage/sql/closing tables 0
+user1 stage/sql/init 0
+user1 stage/sql/Opening tables 0
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 0
+localhost stage/sql/closing tables 0
+localhost stage/sql/init 0
+localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 0
+stage/sql/closing tables 0
+stage/sql/init 0
+stage/sql/Opening tables 0
+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/starting 28
+execute dump_statements_account;
+user host event_name count_star
+execute dump_statements_user;
+user event_name count_star
+user1 statement/com/Error 0
+user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
+user1 statement/sql/insert 0
+user1 statement/sql/select 0
+user2 statement/com/Error 0
+user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
+user2 statement/sql/insert 0
+user2 statement/sql/select 0
+user3 statement/com/Error 0
+user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
+user3 statement/sql/insert 0
+user3 statement/sql/select 0
+user4 statement/com/Error 0
+user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
+user4 statement/sql/insert 0
+user4 statement/sql/select 0
+execute dump_statements_host;
+host event_name count_star
+localhost statement/com/Error 0
+localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
+localhost statement/sql/insert 0
+localhost statement/sql/select 0
+execute dump_statements_global;
+event_name count_star
+statement/com/Error 0
+statement/com/Quit 0
+statement/sp/freturn 0
+statement/sql/insert 0
+statement/sql/select 0
+execute dump_statements_history;
+event_name count(event_name)
+statement/com/Quit 4
+statement/sp/freturn 4
+statement/sql/insert 4
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
+execute dump_accounts;
+USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+execute dump_users;
+USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+root 1 1
+user1 0 1
+user2 0 1
+user3 0 1
+user4 0 1
+execute dump_hosts;
+HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+localhost 1 5
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username status
+user1 not found
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/file/sql/query_log 0
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 0
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+localhost wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_global;
+event_name count_star
+wait/io/file/sql/query_log 0
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
+execute dump_stages_account;
+user host event_name count_star
+execute dump_stages_user;
+user event_name count_star
+user1 stage/sql/checking permissions 0
+user1 stage/sql/closing tables 0
+user1 stage/sql/init 0
+user1 stage/sql/Opening tables 0
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 0
+localhost stage/sql/closing tables 0
+localhost stage/sql/init 0
+localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 0
+stage/sql/closing tables 0
+stage/sql/init 0
+stage/sql/Opening tables 0
+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/starting 28
+execute dump_statements_account;
+user host event_name count_star
+execute dump_statements_user;
+user event_name count_star
+user1 statement/com/Error 0
+user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
+user1 statement/sql/insert 0
+user1 statement/sql/select 0
+user2 statement/com/Error 0
+user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
+user2 statement/sql/insert 0
+user2 statement/sql/select 0
+user3 statement/com/Error 0
+user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
+user3 statement/sql/insert 0
+user3 statement/sql/select 0
+user4 statement/com/Error 0
+user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
+user4 statement/sql/insert 0
+user4 statement/sql/select 0
+execute dump_statements_host;
+host event_name count_star
+localhost statement/com/Error 0
+localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
+localhost statement/sql/insert 0
+localhost statement/sql/select 0
+execute dump_statements_global;
+event_name count_star
+statement/com/Error 0
+statement/com/Quit 0
+statement/sp/freturn 0
+statement/sql/insert 0
+statement/sql/select 0
+execute dump_statements_history;
+event_name count(event_name)
+statement/com/Quit 4
+statement/sp/freturn 4
+statement/sql/insert 4
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 1
+user2 transaction 1
+user3 transaction 1
+user4 transaction 1
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
+execute dump_accounts;
+USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+execute dump_users;
+USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+root 1 1
+user1 0 1
+user2 0 1
+user3 0 1
+user4 0 1
+execute dump_hosts;
+HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+localhost 1 5
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username status
+user1 not found
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/file/sql/query_log 0
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 0
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+localhost wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_global;
+event_name count_star
+wait/io/file/sql/query_log 0
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+<<<<<<< HEAD
+wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> merge-perfschema-5.7
+execute dump_stages_account;
+user host event_name count_star
+execute dump_stages_user;
+user event_name count_star
+user1 stage/sql/checking permissions 0
+user1 stage/sql/closing tables 0
+user1 stage/sql/init 0
+user1 stage/sql/Opening tables 0
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 0
+localhost stage/sql/closing tables 0
+localhost stage/sql/init 0
+localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 0
+stage/sql/closing tables 0
+stage/sql/init 0
+stage/sql/Opening tables 0
+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/starting 28
+execute dump_statements_account;
+user host event_name count_star
+execute dump_statements_user;
+user event_name count_star
+user1 statement/com/Error 0
+user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
+user1 statement/sql/insert 0
+user1 statement/sql/select 0
+user2 statement/com/Error 0
+user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
+user2 statement/sql/insert 0
+user2 statement/sql/select 0
+user3 statement/com/Error 0
+user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
+user3 statement/sql/insert 0
+user3 statement/sql/select 0
+user4 statement/com/Error 0
+user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
+user4 statement/sql/insert 0
+user4 statement/sql/select 0
+execute dump_statements_host;
+host event_name count_star
+localhost statement/com/Error 0
+localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
+localhost statement/sql/insert 0
+localhost statement/sql/select 0
+execute dump_statements_global;
+event_name count_star
+statement/com/Error 0
+statement/com/Quit 0
+statement/sp/freturn 0
+statement/sql/insert 0
+statement/sql/select 0
+execute dump_statements_history;
+event_name count(event_name)
+statement/com/Quit 4
+statement/sp/freturn 4
+statement/sql/insert 4
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 0
+user2 transaction 0
+user3 transaction 0
+user4 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 4
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
+execute dump_accounts;
+USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+execute dump_users;
+USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+root 1 1
+user1 0 1
+user2 0 1
+user3 0 1
+user4 0 1
+execute dump_hosts;
+HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+localhost 1 5
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username status
+user1 not found
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/file/sql/query_log 0
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 0
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+localhost wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_global;
+event_name count_star
+wait/io/file/sql/query_log 0
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+execute dump_stages_account;
+user host event_name count_star
+execute dump_stages_user;
+user event_name count_star
+user1 stage/sql/checking permissions 0
+user1 stage/sql/closing tables 0
+user1 stage/sql/init 0
+user1 stage/sql/Opening tables 0
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 0
+localhost stage/sql/closing tables 0
+localhost stage/sql/init 0
+localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 0
+stage/sql/closing tables 0
+stage/sql/init 0
+stage/sql/Opening tables 0
+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/starting 28
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
user1 statement/sql/insert 0
user1 statement/sql/select 0
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
user2 statement/sql/insert 0
user2 statement/sql/select 0
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
user3 statement/sql/insert 0
user3 statement/sql/select 0
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
user4 statement/sql/insert 0
user4 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 0
statement/sql/insert 0
statement/sql/select 0
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 0
+user2 transaction 0
+user3 transaction 0
+user4 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 4
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
+execute dump_accounts;
+USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+execute dump_users;
+USER CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+root 1 1
+user1 0 1
+user2 0 1
+user3 0 1
+user4 0 1
+execute dump_hosts;
+HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
+localhost 1 5
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username status
+user1 not found
+username status
+user2 not found
+username status
+user3 not found
+username status
+user4 not found
+execute dump_waits_account;
+user host event_name count_star
+execute dump_waits_user;
+user event_name count_star
+user1 wait/io/file/sql/query_log 0
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user4 wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_host;
+host event_name count_star
+localhost wait/io/file/sql/query_log 0
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+localhost wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_global;
+event_name count_star
+wait/io/file/sql/query_log 0
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+execute dump_stages_account;
+user host event_name count_star
+execute dump_stages_user;
+user event_name count_star
+user1 stage/sql/checking permissions 0
+user1 stage/sql/closing tables 0
+user1 stage/sql/init 0
+user1 stage/sql/Opening tables 0
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
+execute dump_stages_host;
+host event_name count_star
+localhost stage/sql/checking permissions 0
+localhost stage/sql/closing tables 0
+localhost stage/sql/init 0
+localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
+execute dump_stages_global;
+event_name count_star
+stage/sql/checking permissions 0
+stage/sql/closing tables 0
+stage/sql/init 0
+stage/sql/Opening tables 0
+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/starting 28
+execute dump_statements_account;
+user host event_name count_star
+execute dump_statements_user;
+user event_name count_star
+user1 statement/com/Error 0
+user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
+user1 statement/sql/insert 0
+user1 statement/sql/select 0
+user2 statement/com/Error 0
+user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
+user2 statement/sql/insert 0
+user2 statement/sql/select 0
+user3 statement/com/Error 0
+user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
+user3 statement/sql/insert 0
+user3 statement/sql/select 0
+user4 statement/com/Error 0
+user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
+user4 statement/sql/insert 0
+user4 statement/sql/select 0
+execute dump_statements_host;
+host event_name count_star
+localhost statement/com/Error 0
+localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
+localhost statement/sql/insert 0
+localhost statement/sql/select 0
+execute dump_statements_global;
+event_name count_star
+statement/com/Error 0
+statement/com/Quit 0
+statement/sp/freturn 0
+statement/sql/insert 0
+statement/sql/select 0
+execute dump_statements_history;
+event_name count(event_name)
+statement/com/Quit 4
+statement/sp/freturn 4
+statement/sql/insert 4
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 0
+user2 transaction 0
+user3 transaction 0
+user4 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 0
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3653,7 +7572,7 @@ HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 5
truncate performance_schema.accounts;
"================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
call dump_thread();
username status
user1 not found
@@ -3668,6 +7587,7 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
+<<<<<<< HEAD
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
@@ -3678,21 +7598,54 @@ user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+user1 wait/synch/mutex/sql/LOCK_connection_count 0
+user1 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user1 wait/synch/rwlock/sql/LOCK_grant 0
+user2 wait/io/file/sql/query_log 0
+user2 wait/synch/mutex/sql/LOCK_connection_count 0
+user2 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user2 wait/synch/rwlock/sql/LOCK_grant 0
+user3 wait/io/file/sql/query_log 0
+user3 wait/synch/mutex/sql/LOCK_connection_count 0
+user3 wait/synch/mutex/sql/LOCK_uuid_generator 0
+user3 wait/synch/rwlock/sql/LOCK_grant 0
+user4 wait/io/file/sql/query_log 0
+user4 wait/synch/mutex/sql/LOCK_connection_count 0
+user4 wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3702,6 +7655,7 @@ user1 stage/sql/Closing tables 0
user1 stage/sql/Init 0
user1 stage/sql/Init for update 0
user1 stage/sql/Opening tables 0
+<<<<<<< HEAD
user2 stage/sql/Checking permissions 0
user2 stage/sql/Closing tables 0
user2 stage/sql/Init 0
@@ -3716,7 +7670,24 @@ user4 stage/sql/Checking permissions 0
user4 stage/sql/Closing tables 0
user4 stage/sql/Init 0
user4 stage/sql/Init for update 0
+=======
+user1 stage/sql/starting 0
+user2 stage/sql/checking permissions 0
+user2 stage/sql/closing tables 0
+user2 stage/sql/init 0
+user2 stage/sql/Opening tables 0
+user2 stage/sql/starting 0
+user3 stage/sql/checking permissions 0
+user3 stage/sql/closing tables 0
+user3 stage/sql/init 0
+user3 stage/sql/Opening tables 0
+user3 stage/sql/starting 0
+user4 stage/sql/checking permissions 0
+user4 stage/sql/closing tables 0
+user4 stage/sql/init 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
user4 stage/sql/Opening tables 0
+user4 stage/sql/starting 0
execute dump_stages_host;
host event_name count_star
localhost stage/sql/Checking permissions 0
@@ -3724,6 +7695,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3731,50 +7703,83 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
user event_name count_star
user1 statement/com/Error 0
user1 statement/com/Quit 0
+user1 statement/sp/freturn 0
user1 statement/sql/insert 0
user1 statement/sql/select 0
user2 statement/com/Error 0
user2 statement/com/Quit 0
+user2 statement/sp/freturn 0
user2 statement/sql/insert 0
user2 statement/sql/select 0
user3 statement/com/Error 0
user3 statement/com/Quit 0
+user3 statement/sp/freturn 0
user3 statement/sql/insert 0
user3 statement/sql/select 0
user4 statement/com/Error 0
user4 statement/com/Quit 0
+user4 statement/sp/freturn 0
user4 statement/sql/insert 0
user4 statement/sql/select 0
execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 0
statement/sql/insert 0
statement/sql/select 0
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+user1 transaction 0
+user2 transaction 0
+user3 transaction 0
+user4 transaction 0
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 0
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3789,7 +7794,7 @@ HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 5
truncate performance_schema.users;
"================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
call dump_thread();
username status
user1 not found
@@ -3806,17 +7811,34 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3828,6 +7850,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3835,13 +7858,22 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
@@ -3850,19 +7882,35 @@ execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 0
statement/sql/insert 0
statement/sql/select 0
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 0
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;
@@ -3873,7 +7921,7 @@ HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
localhost 1 5
truncate performance_schema.hosts;
"================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
call dump_thread();
username status
user1 not found
@@ -3890,17 +7938,34 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
+<<<<<<< HEAD
localhost wait/synch/mutex/sql/LOCK_user_locks 0
+=======
+localhost wait/synch/mutex/sql/LOCK_connection_count 0
+localhost wait/synch/mutex/sql/LOCK_uuid_generator 0
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
+<<<<<<< HEAD
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
wait/synch/rwlock/sql/LOCK_grant 4
+=======
+wait/synch/mutex/sql/LOCK_connection_count 0
+wait/synch/mutex/sql/LOCK_uuid_generator 0
+wait/synch/rwlock/sql/LOCK_grant 0
+execute dump_waits_history;
+event_name count(event_name)
+wait/io/file/sql/query_log 32
+wait/synch/mutex/sql/LOCK_connection_count 4
+wait/synch/mutex/sql/LOCK_uuid_generator 8
+wait/synch/rwlock/sql/LOCK_grant 8
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_stages_account;
user host event_name count_star
execute dump_stages_user;
@@ -3912,6 +7977,7 @@ localhost stage/sql/Closing tables 0
localhost stage/sql/Init 0
localhost stage/sql/Init for update 0
localhost stage/sql/Opening tables 0
+localhost stage/sql/starting 0
execute dump_stages_global;
event_name count_star
stage/sql/Checking permissions 0
@@ -3919,13 +7985,22 @@ stage/sql/Closing tables 0
stage/sql/Init 0
stage/sql/Init for update 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/starting 28
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
execute dump_statements_account;
user host event_name count_star
execute dump_statements_user;
@@ -3934,19 +8009,35 @@ execute dump_statements_host;
host event_name count_star
localhost statement/com/Error 0
localhost statement/com/Quit 0
+localhost statement/sp/freturn 0
localhost statement/sql/insert 0
localhost statement/sql/select 0
execute dump_statements_global;
event_name count_star
statement/com/Error 0
statement/com/Quit 0
+statement/sp/freturn 0
statement/sql/insert 0
statement/sql/select 0
execute dump_statements_history;
event_name count(event_name)
statement/com/Quit 4
+statement/sp/freturn 4
statement/sql/insert 4
-statement/sql/select 8
+statement/sql/select 12
+execute dump_transactions_account;
+user host event_name count_star
+execute dump_transactions_user;
+user event_name count_star
+execute dump_transactions_host;
+host event_name count_star
+localhost transaction 0
+execute dump_transactions_global;
+event_name count_star
+transaction 0
+execute dump_transactions_history;
+event_name count(event_name)
+transaction 4
execute dump_accounts;
USER HOST CURRENT_CONNECTIONS TOTAL_CONNECTIONS
execute dump_users;