diff options
Diffstat (limited to 'mysql-test/suite/perfschema')
32 files changed, 1282 insertions, 1242 deletions
diff --git a/mysql-test/suite/perfschema/r/bad_option_1.result b/mysql-test/suite/perfschema/r/bad_option_1.result index 02fd04afd33..05ff5663882 100644 --- a/mysql-test/suite/perfschema/r/bad_option_1.result +++ b/mysql-test/suite/perfschema/r/bad_option_1.result @@ -1,2 +1,4 @@ +# Kill the server Found: unknown variable 'performance-schema-enabled=maybe' Found: Aborting +# restart diff --git a/mysql-test/suite/perfschema/r/bad_option_2.result b/mysql-test/suite/perfschema/r/bad_option_2.result index 7a5ab31aabd..c2809525827 100644 --- a/mysql-test/suite/perfschema/r/bad_option_2.result +++ b/mysql-test/suite/perfschema/r/bad_option_2.result @@ -1 +1,3 @@ +# Kill the server FOUND 1 /ambiguous option '--performance-schema-max_=12'/ in bad_option_2.txt +# restart diff --git a/mysql-test/suite/perfschema/r/bad_option_3.result b/mysql-test/suite/perfschema/r/bad_option_3.result index ec717d6f7d2..1981f0b2044 100644 --- a/mysql-test/suite/perfschema/r/bad_option_3.result +++ b/mysql-test/suite/perfschema/r/bad_option_3.result @@ -1,2 +1,4 @@ +# Kill the server Found: unknown option '-x' Found: Aborting +# restart diff --git a/mysql-test/suite/perfschema/r/bad_option_4.result b/mysql-test/suite/perfschema/r/bad_option_4.result index 812ee546200..1d50a80be3d 100644 --- a/mysql-test/suite/perfschema/r/bad_option_4.result +++ b/mysql-test/suite/perfschema/r/bad_option_4.result @@ -1,2 +1,4 @@ +# Kill the server Found: Can't change dir to.*bad_option_h_param Found: Aborting +# restart diff --git a/mysql-test/suite/perfschema/r/bad_option_5.result b/mysql-test/suite/perfschema/r/bad_option_5.result index b318b6e0482..840717023ac 100644 --- a/mysql-test/suite/perfschema/r/bad_option_5.result +++ b/mysql-test/suite/perfschema/r/bad_option_5.result @@ -1,2 +1,4 @@ +# Kill the server Found: unknown option '-X' Found: Aborting +# restart diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result index ab850aee933..ce0f87e7733 100644 --- a/mysql-test/suite/perfschema/r/dml_handler.result +++ b/mysql-test/suite/perfschema/r/dml_handler.result @@ -6,6 +6,8 @@ SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='performance_schema' ORDER BY TABLE_NAME; SELECT COUNT(*) FROM table_list INTO @table_count; +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead # For each table in the performance schema, attempt HANDLER...OPEN, # which should fail with an error 1031, ER_ILLEGAL_HA. diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result index a5184782af8..a972cf02285 100644 --- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result +++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result @@ -21,16 +21,16 @@ where name like 'Wait/Synch/Rwlock/sql/%' 'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group') order by name limit 10; NAME ENABLED TIMED +wait/synch/rwlock/sql/LOCK_all_status_vars YES YES wait/synch/rwlock/sql/LOCK_dboptions YES YES wait/synch/rwlock/sql/LOCK_grant YES YES wait/synch/rwlock/sql/LOCK_SEQUENCE YES YES +wait/synch/rwlock/sql/LOCK_ssl_refresh YES YES wait/synch/rwlock/sql/LOCK_system_variables_hash YES YES wait/synch/rwlock/sql/LOCK_sys_init_connect YES YES wait/synch/rwlock/sql/LOCK_sys_init_slave YES YES wait/synch/rwlock/sql/LOGGER::LOCK_logger YES YES wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for YES YES -wait/synch/rwlock/sql/MDL_lock::rwlock YES YES -wait/synch/rwlock/sql/Query_cache_query::lock YES YES select * from performance_schema.setup_instruments where name like 'Wait/Synch/Cond/sql/%' and name not in ( diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result index 9ab62329fc9..7fa08534bb1 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate.result +++ b/mysql-test/suite/perfschema/r/event_aggregate.result @@ -235,38 +235,38 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -363,10 +363,10 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 0 user2 localhost stage/sql/Closing tables 0 user2 localhost stage/sql/Init 0 @@ -375,10 +375,10 @@ user2 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 0 user2 stage/sql/Closing tables 0 user2 stage/sql/Init 0 @@ -387,24 +387,24 @@ user2 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -518,10 +518,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -530,10 +530,10 @@ user2 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -542,24 +542,24 @@ user2 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -677,10 +677,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -694,10 +694,10 @@ user3 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -711,24 +711,24 @@ user3 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -863,10 +863,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -880,10 +880,10 @@ user3 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -897,24 +897,24 @@ user3 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1053,10 +1053,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1075,10 +1075,10 @@ user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1097,24 +1097,24 @@ user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1270,10 +1270,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1292,10 +1292,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1314,24 +1314,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 20 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1478,10 +1478,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1500,10 +1500,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1522,24 +1522,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 21 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1684,10 +1684,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1706,10 +1706,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1728,24 +1728,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 22 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1887,10 +1887,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1909,10 +1909,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1931,24 +1931,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 23 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2087,10 +2087,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2109,10 +2109,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2131,24 +2131,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2288,10 +2288,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2310,10 +2310,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2332,24 +2332,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2488,10 +2488,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2510,10 +2510,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2532,24 +2532,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2688,10 +2688,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2710,10 +2710,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2732,24 +2732,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2888,10 +2888,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2910,10 +2910,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2932,24 +2932,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3088,10 +3088,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -3110,10 +3110,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -3132,24 +3132,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3288,10 +3288,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -3310,10 +3310,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -3332,24 +3332,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3510,10 +3510,10 @@ user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -3532,24 +3532,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3732,24 +3732,24 @@ user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3939,17 +3939,17 @@ localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4146,10 +4146,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4346,10 +4346,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4546,10 +4546,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4746,10 +4746,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4946,10 +4946,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5146,10 +5146,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -5310,10 +5310,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -5418,10 +5418,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -5506,10 +5506,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; 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 ece0402335d..19dec52aa47 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result @@ -217,31 +217,31 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -326,10 +326,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 0 user2 stage/sql/Closing tables 0 user2 stage/sql/Init 0 @@ -338,24 +338,24 @@ user2 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -452,10 +452,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -464,24 +464,24 @@ user2 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -578,10 +578,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -595,24 +595,24 @@ user3 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -721,10 +721,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -738,24 +738,24 @@ user3 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -864,10 +864,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -886,24 +886,24 @@ user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1024,10 +1024,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1046,24 +1046,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 20 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1175,10 +1175,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1197,24 +1197,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 21 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1324,10 +1324,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1346,24 +1346,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 22 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1470,10 +1470,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1492,24 +1492,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 23 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1613,10 +1613,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1635,24 +1635,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1757,10 +1757,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1779,24 +1779,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1900,10 +1900,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1922,24 +1922,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2043,10 +2043,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2065,24 +2065,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2186,10 +2186,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2208,24 +2208,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2329,10 +2329,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2351,24 +2351,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2472,10 +2472,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2494,24 +2494,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2615,10 +2615,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2637,24 +2637,24 @@ user4 stage/sql/Opening tables 3 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2780,24 +2780,24 @@ user4 stage/sql/Opening tables 0 execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2930,17 +2930,17 @@ localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3080,10 +3080,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3223,10 +3223,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3366,10 +3366,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3509,10 +3509,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3652,10 +3652,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3795,10 +3795,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3938,10 +3938,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -4045,10 +4045,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -4132,10 +4132,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result index 083e1bffdd2..3aa27664cac 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result @@ -185,26 +185,26 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -280,10 +280,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 0 user2 stage/sql/Closing tables 0 user2 stage/sql/Init 0 @@ -294,17 +294,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -392,10 +392,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -406,17 +406,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -504,10 +504,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -523,17 +523,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -633,10 +633,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -652,17 +652,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -762,10 +762,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -786,17 +786,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -908,10 +908,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -932,17 +932,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1045,10 +1045,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1069,17 +1069,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1180,10 +1180,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1204,17 +1204,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1312,10 +1312,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1336,17 +1336,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1441,10 +1441,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1465,17 +1465,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1571,10 +1571,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1595,17 +1595,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1700,10 +1700,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1724,17 +1724,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1829,10 +1829,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1853,17 +1853,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1958,10 +1958,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1982,17 +1982,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2087,10 +2087,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2111,17 +2111,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2216,10 +2216,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2240,17 +2240,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2345,10 +2345,10 @@ user host event_name count_star execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2369,17 +2369,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2498,17 +2498,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2627,17 +2627,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2763,10 +2763,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2892,10 +2892,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3021,10 +3021,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3150,10 +3150,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3279,10 +3279,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3408,10 +3408,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3537,10 +3537,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3630,10 +3630,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3703,10 +3703,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result index c9b2b768691..4d4a842948f 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result @@ -199,24 +199,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -289,24 +289,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -386,24 +386,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -479,24 +479,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -579,24 +579,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -675,24 +675,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -778,24 +778,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 20 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -872,24 +872,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 21 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -964,24 +964,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 22 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1053,24 +1053,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 23 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1139,24 +1139,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1226,24 +1226,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1312,24 +1312,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1398,24 +1398,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1484,24 +1484,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1570,24 +1570,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1656,24 +1656,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1742,24 +1742,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1828,24 +1828,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1921,17 +1921,17 @@ localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2014,10 +2014,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2100,10 +2100,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2186,10 +2186,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2272,10 +2272,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2358,10 +2358,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2444,10 +2444,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2530,10 +2530,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2616,10 +2616,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2702,10 +2702,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result index 89443515f31..db281652c0c 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result @@ -169,17 +169,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -245,17 +245,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -328,17 +328,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -407,17 +407,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -493,17 +493,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -575,17 +575,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -664,17 +664,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -744,17 +744,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -822,17 +822,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -897,17 +897,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -969,17 +969,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1042,17 +1042,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1114,17 +1114,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1186,17 +1186,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1258,17 +1258,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1330,17 +1330,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1402,17 +1402,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1474,17 +1474,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1546,17 +1546,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1618,17 +1618,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1697,10 +1697,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1769,10 +1769,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1841,10 +1841,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1913,10 +1913,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -1985,10 +1985,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2057,10 +2057,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2129,10 +2129,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2201,10 +2201,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -2273,10 +2273,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result index 0ea5d90ea41..c8996fa2846 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result @@ -203,33 +203,33 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 execute dump_stages_host; host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -317,10 +317,10 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 0 user2 localhost stage/sql/Closing tables 0 user2 localhost stage/sql/Init 0 @@ -329,10 +329,10 @@ user2 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 0 user2 stage/sql/Closing tables 0 user2 stage/sql/Init 0 @@ -343,17 +343,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -458,10 +458,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -470,10 +470,10 @@ user2 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -484,17 +484,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -603,10 +603,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -620,10 +620,10 @@ user3 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -639,17 +639,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -775,10 +775,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -792,10 +792,10 @@ user3 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -811,17 +811,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -951,10 +951,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -973,10 +973,10 @@ user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -997,17 +997,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1154,10 +1154,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1176,10 +1176,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 5 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1200,17 +1200,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1348,10 +1348,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1370,10 +1370,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 5 @@ -1394,17 +1394,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1540,10 +1540,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1562,10 +1562,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1586,17 +1586,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1729,10 +1729,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1751,10 +1751,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1775,17 +1775,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1915,10 +1915,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1937,10 +1937,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -1961,17 +1961,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2102,10 +2102,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2124,10 +2124,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2148,17 +2148,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2288,10 +2288,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2310,10 +2310,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2334,17 +2334,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2474,10 +2474,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2496,10 +2496,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2520,17 +2520,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2660,10 +2660,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2682,10 +2682,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2706,17 +2706,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2846,10 +2846,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2868,10 +2868,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -2892,17 +2892,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3032,10 +3032,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -3054,10 +3054,10 @@ user4 localhost stage/sql/Opening tables 3 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -3078,17 +3078,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3240,10 +3240,10 @@ user4 localhost stage/sql/Opening tables 0 execute dump_stages_user; user event_name count_star user1 stage/sql/Checking permissions 3 -user1 stage/sql/Closing tables 4 +user1 stage/sql/Closing tables 6 user1 stage/sql/Init 6 user1 stage/sql/Init for update 1 -user1 stage/sql/Opening tables 3 +user1 stage/sql/Opening tables 4 user2 stage/sql/Checking permissions 3 user2 stage/sql/Closing tables 4 user2 stage/sql/Init 6 @@ -3264,17 +3264,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3450,17 +3450,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3636,17 +3636,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3829,10 +3829,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4015,10 +4015,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4201,10 +4201,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4387,10 +4387,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4573,10 +4573,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4759,10 +4759,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -4909,10 +4909,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -5003,10 +5003,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -5077,10 +5077,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result index 52c674024bd..508a65d9ba0 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result @@ -215,33 +215,33 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 execute dump_stages_user; user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -324,10 +324,10 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 0 user2 localhost stage/sql/Closing tables 0 user2 localhost stage/sql/Init 0 @@ -338,24 +338,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 3 -localhost stage/sql/Closing tables 4 +localhost stage/sql/Closing tables 6 localhost stage/sql/Init 5 localhost stage/sql/Init for update 1 -localhost stage/sql/Opening tables 3 +localhost stage/sql/Opening tables 4 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -450,10 +450,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -464,24 +464,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -576,10 +576,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -595,24 +595,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 6 -localhost stage/sql/Closing tables 8 +localhost stage/sql/Closing tables 10 localhost stage/sql/Init 10 localhost stage/sql/Init for update 2 -localhost stage/sql/Opening tables 6 +localhost stage/sql/Opening tables 7 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -719,10 +719,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -738,24 +738,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -862,10 +862,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -886,24 +886,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 9 -localhost stage/sql/Closing tables 12 +localhost stage/sql/Closing tables 14 localhost stage/sql/Init 15 localhost stage/sql/Init for update 3 -localhost stage/sql/Opening tables 9 +localhost stage/sql/Opening tables 10 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1022,10 +1022,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1046,24 +1046,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 20 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1173,10 +1173,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1197,24 +1197,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 21 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1322,10 +1322,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1346,24 +1346,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 22 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1468,10 +1468,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1492,24 +1492,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 23 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1611,10 +1611,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1635,24 +1635,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1755,10 +1755,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1779,24 +1779,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1898,10 +1898,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1922,24 +1922,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2041,10 +2041,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2065,24 +2065,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2184,10 +2184,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2208,24 +2208,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2327,10 +2327,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2351,24 +2351,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2470,10 +2470,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2494,24 +2494,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2637,24 +2637,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2780,24 +2780,24 @@ user event_name count_star execute dump_stages_host; host event_name count_star localhost stage/sql/Checking permissions 12 -localhost stage/sql/Closing tables 16 +localhost stage/sql/Closing tables 18 localhost stage/sql/Init 24 localhost stage/sql/Init for update 4 -localhost stage/sql/Opening tables 12 +localhost stage/sql/Opening tables 13 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2930,17 +2930,17 @@ localhost stage/sql/Opening tables 0 execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3080,10 +3080,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3223,10 +3223,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3366,10 +3366,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3509,10 +3509,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3652,10 +3652,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3795,10 +3795,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3902,10 +3902,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3989,10 +3989,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -4076,10 +4076,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result index a493631d71f..579fadc51c0 100644 --- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result +++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result @@ -183,10 +183,10 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 execute dump_stages_user; user event_name count_star execute dump_stages_host; @@ -194,17 +194,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -278,10 +278,10 @@ wait/synch/rwlock/sql/LOCK_grant 1 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 0 user2 localhost stage/sql/Closing tables 0 user2 localhost stage/sql/Init 0 @@ -294,17 +294,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 3 -stage/sql/Closing tables 4 +stage/sql/Closing tables 6 stage/sql/Init 5 stage/sql/Init for update 1 -stage/sql/Opening tables 3 +stage/sql/Opening tables 4 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -390,10 +390,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -406,17 +406,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -502,10 +502,10 @@ wait/synch/rwlock/sql/LOCK_grant 2 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -523,17 +523,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 6 -stage/sql/Closing tables 8 +stage/sql/Closing tables 10 stage/sql/Init 10 stage/sql/Init for update 2 -stage/sql/Opening tables 6 +stage/sql/Opening tables 7 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -631,10 +631,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -652,17 +652,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -760,10 +760,10 @@ wait/synch/rwlock/sql/LOCK_grant 3 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -786,17 +786,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 9 -stage/sql/Closing tables 12 +stage/sql/Closing tables 14 stage/sql/Init 15 stage/sql/Init for update 3 -stage/sql/Opening tables 9 +stage/sql/Opening tables 10 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -906,10 +906,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 5 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -932,17 +932,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 20 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1043,10 +1043,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 5 @@ -1069,17 +1069,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 21 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1178,10 +1178,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1204,17 +1204,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 22 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1310,10 +1310,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1336,17 +1336,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 23 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1439,10 +1439,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1465,17 +1465,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1569,10 +1569,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1595,17 +1595,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1698,10 +1698,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1724,17 +1724,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1827,10 +1827,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1853,17 +1853,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -1956,10 +1956,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -1982,17 +1982,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2085,10 +2085,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2111,17 +2111,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2214,10 +2214,10 @@ wait/synch/rwlock/sql/LOCK_grant 4 execute dump_stages_account; user host event_name count_star user1 localhost stage/sql/Checking permissions 3 -user1 localhost stage/sql/Closing tables 4 +user1 localhost stage/sql/Closing tables 6 user1 localhost stage/sql/Init 6 user1 localhost stage/sql/Init for update 1 -user1 localhost stage/sql/Opening tables 3 +user1 localhost stage/sql/Opening tables 4 user2 localhost stage/sql/Checking permissions 3 user2 localhost stage/sql/Closing tables 4 user2 localhost stage/sql/Init 6 @@ -2240,17 +2240,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2369,17 +2369,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2498,17 +2498,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2627,17 +2627,17 @@ host event_name count_star execute dump_stages_global; event_name count_star stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2763,10 +2763,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -2892,10 +2892,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3021,10 +3021,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3150,10 +3150,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3279,10 +3279,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3408,10 +3408,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star user1 localhost statement/com/Error 0 @@ -3501,10 +3501,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3574,10 +3574,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; @@ -3647,10 +3647,10 @@ stage/sql/Opening tables 0 execute dump_stages_history; event_name count(event_name) stage/sql/Checking permissions 12 -stage/sql/Closing tables 16 +stage/sql/Closing tables 18 stage/sql/Init 24 stage/sql/Init for update 4 -stage/sql/Opening tables 12 +stage/sql/Opening tables 13 execute dump_statements_account; user host event_name count_star execute dump_statements_user; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result index a172dff7935..7963bed8213 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result @@ -118,7 +118,7 @@ Con4 is alive Con4 is alive select current_user(); current_user() -root@192.0.2.4 +root@santa.claus.ipv4.example.com disconnect con4; connection default; "Dumping performance_schema.host_cache" @@ -155,7 +155,7 @@ Con5 is alive Con5 is alive select current_user(); current_user() -root@192.0.2.4 +root@santa.claus.ipv4.example.com disconnect con5; connection default; "Dumping performance_schema.host_cache" diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result index 4fdc6ef1b4c..baddc88b116 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result @@ -118,7 +118,7 @@ Con4 is alive Con4 is alive select current_user(); current_user() -root@2001:db8::6:6 +root@santa.claus.ipv6.example.com disconnect con4; connection default; "Dumping performance_schema.host_cache" @@ -155,7 +155,7 @@ Con5 is alive Con5 is alive select current_user(); current_user() -root@2001:db8::6:6 +root@santa.claus.ipv6.example.com disconnect con5; connection default; "Dumping performance_schema.host_cache" diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index 299551051c9..a1fb88e7059 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -95,6 +95,8 @@ close pfs_cursor; signal sqlstate '01000' set message_text='Done', mysql_errno=12000; end $ +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead show variables where `Variable_name` != "performance_schema_max_statement_classes" and `Variable_name` like "performance_schema%"; diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index 5443c178502..2cdcb494d6a 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -1,3 +1,4 @@ +# restart drop table if exists test.marker; create table test.marker(a int); update performance_schema.setup_consumers set enabled='NO'; @@ -8,7 +9,6 @@ truncate table performance_schema.events_waits_history_long; flush status; flush tables; # We are forced to suppress here the server response. -optimize table mysql.host; optimize table mysql.user; optimize table mysql.db; optimize table mysql.proxies_priv; @@ -96,12 +96,11 @@ where event_name like 'wait/io/table/%' and object_schema in ("test", "mysql") order by thread_id, event_id; event_name short_source object_type object_schema pretty_name operation number_of_bytes -wait/io/table/sql/handler handler.cc: TABLE mysql host fetch NULL -wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL -wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL -wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL -wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL -wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL @@ -112,6 +111,8 @@ wait/io/table/sql/handler handler.cc: TABLE mysql roles_mapping fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql procs_priv fetch NULL wait/io/table/sql/handler handler.cc: TABLE mysql servers fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql table_stats fetch NULL +wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL diff --git a/mysql-test/suite/perfschema/r/selects.result b/mysql-test/suite/perfschema/r/selects.result index c14d152856f..d623d45a6e8 100644 --- a/mysql-test/suite/perfschema/r/selects.result +++ b/mysql-test/suite/perfschema/r/selects.result @@ -93,6 +93,8 @@ SELECT thread_id FROM performance_schema.threads WHERE PROCESSLIST_ID = conid INTO pid; END; | +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead CALL t_ps_proc(connection_id(), @p_id); DROP FUNCTION IF EXISTS t_ps_proc; CREATE FUNCTION t_ps_func(conid INT) RETURNS int diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result index 1bdb9884606..25f3f180735 100644 --- a/mysql-test/suite/perfschema/r/server_init.result +++ b/mysql-test/suite/perfschema/r/server_init.result @@ -68,10 +68,6 @@ where name like "wait/synch/mutex/sql/LOCK_crypt"; count(name) 1 select count(name) from mutex_instances -where name like "wait/synch/mutex/sql/LOCK_slave_list"; -count(name) -1 -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_active_mi"; count(name) 1 diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result index f31bb1a8b7a..7384313917d 100644 --- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result +++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result @@ -17,7 +17,6 @@ SELECT * FROM performance_schema.setup_instruments WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count' AND enabled = 'no' AND timed = 'no'; NAME ENABLED TIMED -wait/synch/mutex/sql/LOCK_thread_count NO NO SELECT * FROM performance_schema.setup_instruments WHERE name IN ( 'wait/synch/mutex/sql/LOG_INFO::lock', @@ -25,7 +24,6 @@ WHERE name IN ( AND enabled = 'yes' AND timed = 'yes' ORDER BY name; NAME ENABLED TIMED -wait/synch/mutex/sql/LOG_INFO::lock YES YES wait/synch/mutex/sql/THD::LOCK_thd_data YES YES SELECT * FROM performance_schema.setup_instruments WHERE name = 'wait/synch/mutex/sql/hash_filo::lock' diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result index 7d15b250bd9..11531124cae 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_global.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result @@ -22,7 +22,7 @@ call dump_one_thread('user2'); username event_name sql_text user2 statement/sql/insert insert into test.t1 values (1), (2), (3) username event_name nesting_event_type -user2 stage/sql/Waiting for global read lock STATEMENT +user2 stage/sql/Waiting for backup lock STATEMENT username event_name nesting_event_type user2 stage/sql/Init STATEMENT user2 stage/sql/Checking permissions STATEMENT diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result index 5c4cf88e9a5..8caf2017fd2 100644 --- a/mysql-test/suite/perfschema/r/table_schema.result +++ b/mysql-test/suite/perfschema/r/table_schema.result @@ -799,6 +799,8 @@ def performance_schema users TOTAL_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 N select count(*) from information_schema.columns where table_schema="performance_schema" and data_type = "bigint" and column_name like "%number_of_bytes" into @count_byte_columns; +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select @count_byte_columns > 0; @count_byte_columns > 0 1 @@ -806,12 +808,16 @@ select count(*) from information_schema.columns where table_schema="performance_schema" and data_type="bigint" and column_name like "%number_of_bytes" and column_type not like "%unsigned" into @count_byte_signed; +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select (@count_byte_columns - @count_byte_signed) = 0; (@count_byte_columns - @count_byte_signed) = 0 1 select count(*) from information_schema.columns where table_schema="performance_schema" and data_type = "bigint" and column_name like "%object_instance_begin" into @count_object_columns; +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select @count_object_columns > 0; @count_object_columns > 0 1 @@ -819,6 +825,8 @@ select count(*) from information_schema.columns where table_schema="performance_schema" and data_type="bigint" and column_name like "%object_instance_begin" and column_type like "%unsigned" into @count_object_unsigned; +Warnings: +Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead select (@count_object_columns - @count_object_unsigned) = 0; (@count_object_columns - @count_object_unsigned) = 0 1 diff --git a/mysql-test/suite/perfschema/t/bad_option_1.test b/mysql-test/suite/perfschema/t/bad_option_1.test index 1c76dbdc512..bba0d6d5357 100644 --- a/mysql-test/suite/perfschema/t/bad_option_1.test +++ b/mysql-test/suite/perfschema/t/bad_option_1.test @@ -4,9 +4,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/kill_mysqld.inc + let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_1.txt; +--disable_warnings --error 0,1 --remove_file $outfile +--enable_warnings --error 7 --exec $MYSQLD_BOOTSTRAP_CMD --loose-console --performance-schema-enabled=maybe > $outfile 2>&1 @@ -32,3 +36,4 @@ perl; EOF --remove_file $outfile +--source include/start_mysqld.inc diff --git a/mysql-test/suite/perfschema/t/bad_option_2.test b/mysql-test/suite/perfschema/t/bad_option_2.test index ce3e5c3243b..d6c2b905167 100644 --- a/mysql-test/suite/perfschema/t/bad_option_2.test +++ b/mysql-test/suite/perfschema/t/bad_option_2.test @@ -4,9 +4,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/kill_mysqld.inc + let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_2.txt; +--disable_warnings --error 0,1 --remove_file $outfile +--enable_warnings --error 3 --exec $MYSQLD_BOOTSTRAP_CMD --loose-console --enable-getopt-prefix-matching --performance-schema-max_=12 > $outfile 2>&1 --let SEARCH_PATTERN=ambiguous option '--performance-schema-max_=12' @@ -14,3 +18,4 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_2.txt; --source include/search_pattern_in_file.inc --remove_file $outfile +--source include/start_mysqld.inc diff --git a/mysql-test/suite/perfschema/t/bad_option_3.test b/mysql-test/suite/perfschema/t/bad_option_3.test index 63565df14a2..a4efcbccd74 100644 --- a/mysql-test/suite/perfschema/t/bad_option_3.test +++ b/mysql-test/suite/perfschema/t/bad_option_3.test @@ -4,9 +4,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/kill_mysqld.inc + let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_3.txt; +--disable_warnings --error 0,1 --remove_file $outfile +--enable_warnings --error 2 --exec $MYSQLD_BOOTSTRAP_CMD --loose-console -a -x > $outfile 2>&1 @@ -32,3 +36,4 @@ perl; EOF --remove_file $outfile +--source include/start_mysqld.inc diff --git a/mysql-test/suite/perfschema/t/bad_option_4.test b/mysql-test/suite/perfschema/t/bad_option_4.test index 27a32c201a9..ee8705788bc 100644 --- a/mysql-test/suite/perfschema/t/bad_option_4.test +++ b/mysql-test/suite/perfschema/t/bad_option_4.test @@ -4,9 +4,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/kill_mysqld.inc + let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_4.txt; +--disable_warnings --error 0,1 --remove_file $outfile +--enable_warnings --error 1 --exec $MYSQLD_BOOTSTRAP_CMD --loose-console -a -h bad_option_h_param > $outfile 2>&1 @@ -32,3 +36,4 @@ perl; EOF --remove_file $outfile +--source include/start_mysqld.inc diff --git a/mysql-test/suite/perfschema/t/bad_option_5.test b/mysql-test/suite/perfschema/t/bad_option_5.test index ada8228b249..c9c6fc75d52 100644 --- a/mysql-test/suite/perfschema/t/bad_option_5.test +++ b/mysql-test/suite/perfschema/t/bad_option_5.test @@ -4,9 +4,13 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/kill_mysqld.inc + let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_5.txt; +--disable_warnings --error 0,1 --remove_file $outfile +--enable_warnings --error 2 --exec $MYSQLD_BOOTSTRAP_CMD --loose-console -aXbroken > $outfile 2>&1 @@ -35,3 +39,4 @@ perl; EOF --remove_file $outfile +--source include/start_mysqld.inc diff --git a/mysql-test/suite/perfschema/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test index 6f729537072..a74805f5c7b 100644 --- a/mysql-test/suite/perfschema/t/privilege_table_io.test +++ b/mysql-test/suite/perfschema/t/privilege_table_io.test @@ -17,7 +17,6 @@ # Therefore we suppress the query_log here. --echo # We are forced to suppress here the server response. --disable_result_log -optimize table mysql.host; optimize table mysql.user; optimize table mysql.db; optimize table mysql.proxies_priv; diff --git a/mysql-test/suite/perfschema/t/server_init.test b/mysql-test/suite/perfschema/t/server_init.test index c6d25f18426..36e09adea78 100644 --- a/mysql-test/suite/perfschema/t/server_init.test +++ b/mysql-test/suite/perfschema/t/server_init.test @@ -71,9 +71,6 @@ select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_crypt"; select count(name) from mutex_instances - where name like "wait/synch/mutex/sql/LOCK_slave_list"; - -select count(name) from mutex_instances where name like "wait/synch/mutex/sql/LOCK_active_mi"; select count(name) from mutex_instances diff --git a/mysql-test/suite/perfschema/t/stage_mdl_global.test b/mysql-test/suite/perfschema/t/stage_mdl_global.test index 8863d2da903..03c3d315899 100644 --- a/mysql-test/suite/perfschema/t/stage_mdl_global.test +++ b/mysql-test/suite/perfschema/t/stage_mdl_global.test @@ -9,7 +9,7 @@ flush tables with read lock; connect (con2, localhost, user2, , ); -# Will wait on con1, "Waiting for global read lock" +# Will wait on con1, "Waiting for backup lock" --send insert into test.t1 values (1), (2), (3); @@ -26,7 +26,7 @@ let $wait_condition= let $wait_condition= select count(*) = 1 from performance_schema.threads where `TYPE`='FOREGROUND' and PROCESSLIST_USER like 'user2' - and PROCESSLIST_STATE = 'Waiting for global read lock'; + and PROCESSLIST_STATE = 'Waiting for backup lock'; --source include/wait_condition.inc call dump_one_thread('user1'); |