MDEV-33620 Improve times and states in show processlist for replication

This will makes it easier to find out what replication workers are
doing and what they are waiting for.

Things changed in processlist:
- Slave_SQL time was not consistent. Now time for state "Slave has
  read all relay log; waiting for more updates" shows how long it has
  waited for getting the next event.
- Slave_worker threads did often show "Closing tables" for a long
  time.  Now the state is reverted to the previous state after
  "Closing tables" is done.
- Commit and Rollback states where not shown for replication (and some
  other threads). Now Commit and Rollback states are always shown and
  the state is reverted to previous state when the Commit/Rollback
  have finished.

Code changes:
- Added thd->set_time_for_next_stage() for parallel replication when
  when starting to wait for prior transactions to commit, group commit,
  and FTWRL and for free space in thread pool.
  Before we reset the time only after the above events.
- Moved THD_STAGE_INFO(stage_rollback) and THD_STAGE_INFO(stage_commit)
  from sql_parse.cc to transaction.cc to ensure this is done for
  all commits and not only 'normal connection queries'.

Test case changes:
- close_thread_tables() reverting stage to previous stage caused the
  counter in performance_schema to be increased. In many case it is
  the 'sql/starting' stage that was effected.
- We only change to "Commit" stage if there is a need for a commit.
  This caused some "Commit" stages to disapper from perfschema reports.

TODO in 11.#:
- Slave_IO always showes "Waiting for master to send event" and the time is
  from SLAVE START. We should in 11.# change this to be the time since
  reading the last event.

mysql-test/suite/perfschema/r/alter_table_progress.result

@@ -82,11 +82,10 @@ stage/sql/Unlocking tables	NULL	NULL
 stage/sql/Rename result table	NULL	NULL
 stage/sql/End of update loop	NULL	NULL
 stage/sql/Query end	NULL	NULL
-stage/sql/Commit	NULL	NULL
 stage/sql/closing tables	NULL	NULL
 stage/sql/Unlocking tables	NULL	NULL
 stage/sql/closing tables	NULL	NULL
-stage/sql/Commit implicit	NULL	NULL
+stage/sql/Query end	NULL	NULL
 stage/sql/Starting cleanup	NULL	NULL
 stage/sql/Freeing items	NULL	NULL
 stage/sql/Reset for next command	NULL	NULL

mysql-test/suite/perfschema/r/event_aggregate_no_a.result

@@ -235,28 +235,28 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	4
 localhost	stage/sql/closing tables	11
 localhost	stage/sql/init	3
 localhost	stage/sql/Opening tables	7
-localhost	stage/sql/starting	6
+localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -350,7 +350,7 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
 user2	stage/sql/init	0
@@ -362,21 +362,21 @@ localhost	stage/sql/checking permissions	4
 localhost	stage/sql/closing tables	11
 localhost	stage/sql/init	3
 localhost	stage/sql/Opening tables	7
-localhost	stage/sql/starting	6
+localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -489,33 +489,33 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	8
 localhost	stage/sql/closing tables	21
 localhost	stage/sql/init	6
 localhost	stage/sql/Opening tables	13
-localhost	stage/sql/starting	12
+localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -619,12 +619,12 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	0
 user3	stage/sql/closing tables	0
 user3	stage/sql/init	0
@@ -636,21 +636,21 @@ localhost	stage/sql/checking permissions	8
 localhost	stage/sql/closing tables	21
 localhost	stage/sql/init	6
 localhost	stage/sql/Opening tables	13
-localhost	stage/sql/starting	12
+localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -773,38 +773,38 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	12
 localhost	stage/sql/closing tables	31
 localhost	stage/sql/init	9
 localhost	stage/sql/Opening tables	19
-localhost	stage/sql/starting	18
+localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -918,17 +918,17 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
@@ -940,21 +940,21 @@ localhost	stage/sql/checking permissions	12
 localhost	stage/sql/closing tables	31
 localhost	stage/sql/init	9
 localhost	stage/sql/Opening tables	19
-localhost	stage/sql/starting	18
+localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1087,43 +1087,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	24
+localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1243,43 +1243,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	25
+localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1399,43 +1399,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	26
+localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1554,43 +1554,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	27
+localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1708,43 +1708,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1863,43 +1863,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2017,43 +2017,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2171,43 +2171,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2325,43 +2325,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2479,43 +2479,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2633,43 +2633,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2787,43 +2787,43 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2963,21 +2963,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3124,14 +3124,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3285,7 +3285,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3439,7 +3439,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3593,7 +3593,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3747,7 +3747,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3901,7 +3901,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4055,7 +4055,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4209,7 +4209,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4363,7 +4363,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4517,7 +4517,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4671,7 +4671,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4825,7 +4825,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4979,7 +4979,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5105,7 +5105,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5203,7 +5203,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;

mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result

@@ -205,7 +205,7 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -214,14 +214,14 @@ stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -306,7 +306,7 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
 user2	stage/sql/init	0
@@ -320,14 +320,14 @@ stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -431,12 +431,12 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -445,14 +445,14 @@ stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -547,12 +547,12 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	0
 user3	stage/sql/closing tables	0
 user3	stage/sql/init	0
@@ -566,14 +566,14 @@ stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -687,17 +687,17 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -706,14 +706,14 @@ stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -818,17 +818,17 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
@@ -842,14 +842,14 @@ stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -973,22 +973,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	6
+user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -997,14 +997,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1115,22 +1115,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	6
+user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1139,14 +1139,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1257,22 +1257,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	6
+user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1281,14 +1281,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1398,22 +1398,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	6
+user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1422,14 +1422,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1538,22 +1538,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1562,14 +1562,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1679,22 +1679,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1703,14 +1703,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1819,22 +1819,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1843,14 +1843,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1959,22 +1959,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -1983,14 +1983,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2099,22 +2099,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -2123,14 +2123,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2239,22 +2239,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -2263,14 +2263,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2379,22 +2379,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -2403,14 +2403,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2519,22 +2519,22 @@ user1	stage/sql/checking permissions	4
 user1	stage/sql/closing tables	11
 user1	stage/sql/init	3
 user1	stage/sql/Opening tables	7
-user1	stage/sql/starting	7
+user1	stage/sql/starting	8
 user2	stage/sql/checking permissions	4
 user2	stage/sql/closing tables	10
 user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
-user2	stage/sql/starting	7
+user2	stage/sql/starting	8
 user3	stage/sql/checking permissions	4
 user3	stage/sql/closing tables	10
 user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
-user3	stage/sql/starting	7
+user3	stage/sql/starting	8
 user4	stage/sql/checking permissions	4
 user4	stage/sql/closing tables	10
 user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
-user4	stage/sql/starting	7
+user4	stage/sql/starting	8
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
@@ -2543,14 +2543,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2683,14 +2683,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2823,14 +2823,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2970,7 +2970,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3110,7 +3110,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3250,7 +3250,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3390,7 +3390,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3530,7 +3530,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3670,7 +3670,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3810,7 +3810,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3950,7 +3950,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4090,7 +4090,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4230,7 +4230,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4370,7 +4370,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4510,7 +4510,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4622,7 +4622,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4706,7 +4706,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;

mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result

@@ -219,21 +219,21 @@ localhost	stage/sql/checking permissions	4
 localhost	stage/sql/closing tables	11
 localhost	stage/sql/init	3
 localhost	stage/sql/Opening tables	7
-localhost	stage/sql/starting	6
+localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -317,21 +317,21 @@ localhost	stage/sql/checking permissions	4
 localhost	stage/sql/closing tables	11
 localhost	stage/sql/init	3
 localhost	stage/sql/Opening tables	7
-localhost	stage/sql/starting	6
+localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -427,21 +427,21 @@ localhost	stage/sql/checking permissions	8
 localhost	stage/sql/closing tables	21
 localhost	stage/sql/init	6
 localhost	stage/sql/Opening tables	13
-localhost	stage/sql/starting	12
+localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -526,21 +526,21 @@ localhost	stage/sql/checking permissions	8
 localhost	stage/sql/closing tables	21
 localhost	stage/sql/init	6
 localhost	stage/sql/Opening tables	13
-localhost	stage/sql/starting	12
+localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -637,21 +637,21 @@ localhost	stage/sql/checking permissions	12
 localhost	stage/sql/closing tables	31
 localhost	stage/sql/init	9
 localhost	stage/sql/Opening tables	19
-localhost	stage/sql/starting	18
+localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -737,21 +737,21 @@ localhost	stage/sql/checking permissions	12
 localhost	stage/sql/closing tables	31
 localhost	stage/sql/init	9
 localhost	stage/sql/Opening tables	19
-localhost	stage/sql/starting	18
+localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -849,21 +849,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	24
+localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -948,21 +948,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	25
+localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1047,21 +1047,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	26
+localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1145,21 +1145,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	27
+localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1242,21 +1242,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1340,21 +1340,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1437,21 +1437,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1534,21 +1534,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1631,21 +1631,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1728,21 +1728,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1825,21 +1825,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1922,21 +1922,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2019,21 +2019,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2123,14 +2123,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2227,7 +2227,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2324,7 +2324,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2421,7 +2421,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2518,7 +2518,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2615,7 +2615,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2712,7 +2712,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2809,7 +2809,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2906,7 +2906,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3003,7 +3003,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3100,7 +3100,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3197,7 +3197,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3294,7 +3294,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3391,7 +3391,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3488,7 +3488,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;

mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result

@@ -191,14 +191,14 @@ stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -275,14 +275,14 @@ stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -371,14 +371,14 @@ stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -456,14 +456,14 @@ stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -553,14 +553,14 @@ stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -639,14 +639,14 @@ stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -737,14 +737,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -822,14 +822,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -907,14 +907,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -991,14 +991,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1074,14 +1074,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1158,14 +1158,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1241,14 +1241,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1324,14 +1324,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1407,14 +1407,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1490,14 +1490,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1573,14 +1573,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1656,14 +1656,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1739,14 +1739,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1822,14 +1822,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1912,7 +1912,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1995,7 +1995,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2078,7 +2078,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2161,7 +2161,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2244,7 +2244,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2327,7 +2327,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2410,7 +2410,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2493,7 +2493,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2576,7 +2576,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2659,7 +2659,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2742,7 +2742,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2825,7 +2825,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2908,7 +2908,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2991,7 +2991,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;

mysql-test/suite/perfschema/r/event_aggregate_no_u.result

@@ -233,7 +233,7 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -242,21 +242,21 @@ localhost	stage/sql/checking permissions	4
 localhost	stage/sql/closing tables	11
 localhost	stage/sql/init	3
 localhost	stage/sql/Opening tables	7
-localhost	stage/sql/starting	6
+localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -348,7 +348,7 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
 user2	localhost	stage/sql/init	0
@@ -362,21 +362,21 @@ localhost	stage/sql/checking permissions	4
 localhost	stage/sql/closing tables	11
 localhost	stage/sql/init	3
 localhost	stage/sql/Opening tables	7
-localhost	stage/sql/starting	6
+localhost	stage/sql/starting	7
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -487,12 +487,12 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -501,21 +501,21 @@ localhost	stage/sql/checking permissions	8
 localhost	stage/sql/closing tables	21
 localhost	stage/sql/init	6
 localhost	stage/sql/Opening tables	13
-localhost	stage/sql/starting	12
+localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -617,12 +617,12 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	0
 user3	localhost	stage/sql/closing tables	0
 user3	localhost	stage/sql/init	0
@@ -636,21 +636,21 @@ localhost	stage/sql/checking permissions	8
 localhost	stage/sql/closing tables	21
 localhost	stage/sql/init	6
 localhost	stage/sql/Opening tables	13
-localhost	stage/sql/starting	12
+localhost	stage/sql/starting	14
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -771,17 +771,17 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -790,21 +790,21 @@ localhost	stage/sql/checking permissions	12
 localhost	stage/sql/closing tables	31
 localhost	stage/sql/init	9
 localhost	stage/sql/Opening tables	19
-localhost	stage/sql/starting	18
+localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -916,17 +916,17 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
@@ -940,21 +940,21 @@ localhost	stage/sql/checking permissions	12
 localhost	stage/sql/closing tables	31
 localhost	stage/sql/init	9
 localhost	stage/sql/Opening tables	19
-localhost	stage/sql/starting	18
+localhost	stage/sql/starting	21
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1085,22 +1085,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1109,21 +1109,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	24
+localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1241,22 +1241,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1265,21 +1265,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	25
+localhost	stage/sql/starting	29
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1397,22 +1397,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1421,21 +1421,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	26
+localhost	stage/sql/starting	30
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1552,22 +1552,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1576,21 +1576,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	27
+localhost	stage/sql/starting	31
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1706,22 +1706,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1730,21 +1730,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1861,22 +1861,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1885,21 +1885,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2015,22 +2015,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2039,21 +2039,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2169,22 +2169,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2193,21 +2193,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2323,22 +2323,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2347,21 +2347,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2477,22 +2477,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2501,21 +2501,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2631,22 +2631,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2655,21 +2655,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2809,21 +2809,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2963,21 +2963,21 @@ localhost	stage/sql/checking permissions	16
 localhost	stage/sql/closing tables	41
 localhost	stage/sql/init	12
 localhost	stage/sql/Opening tables	25
-localhost	stage/sql/starting	28
+localhost	stage/sql/starting	32
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3124,14 +3124,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3285,7 +3285,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3439,7 +3439,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3593,7 +3593,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3747,7 +3747,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3901,7 +3901,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4055,7 +4055,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4209,7 +4209,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4363,7 +4363,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4517,7 +4517,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4671,7 +4671,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4825,7 +4825,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4951,7 +4951,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5049,7 +5049,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5147,7 +5147,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;

mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result

@@ -203,7 +203,7 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -214,14 +214,14 @@ stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -304,7 +304,7 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
 user2	localhost	stage/sql/init	0
@@ -320,14 +320,14 @@ stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
 stage/sql/closing tables	11
 stage/sql/init	3
 stage/sql/Opening tables	7
-stage/sql/starting	6
+stage/sql/starting	7
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -429,12 +429,12 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -445,14 +445,14 @@ stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -545,12 +545,12 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	0
 user3	localhost	stage/sql/closing tables	0
 user3	localhost	stage/sql/init	0
@@ -566,14 +566,14 @@ stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
 stage/sql/closing tables	21
 stage/sql/init	6
 stage/sql/Opening tables	13
-stage/sql/starting	12
+stage/sql/starting	14
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -685,17 +685,17 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -706,14 +706,14 @@ stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -816,17 +816,17 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
@@ -842,14 +842,14 @@ stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
 stage/sql/closing tables	31
 stage/sql/init	9
 stage/sql/Opening tables	19
-stage/sql/starting	18
+stage/sql/starting	21
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -971,22 +971,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	6
+user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -997,14 +997,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	24
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1113,22 +1113,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	6
+user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1139,14 +1139,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	25
+stage/sql/starting	29
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1255,22 +1255,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	6
+user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1281,14 +1281,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	26
+stage/sql/starting	30
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1396,22 +1396,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	6
+user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1422,14 +1422,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	27
+stage/sql/starting	31
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1536,22 +1536,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1562,14 +1562,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1677,22 +1677,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1703,14 +1703,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1817,22 +1817,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1843,14 +1843,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1957,22 +1957,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -1983,14 +1983,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2097,22 +2097,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2123,14 +2123,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2237,22 +2237,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2263,14 +2263,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2377,22 +2377,22 @@ user1	localhost	stage/sql/checking permissions	4
 user1	localhost	stage/sql/closing tables	11
 user1	localhost	stage/sql/init	3
 user1	localhost	stage/sql/Opening tables	7
-user1	localhost	stage/sql/starting	7
+user1	localhost	stage/sql/starting	8
 user2	localhost	stage/sql/checking permissions	4
 user2	localhost	stage/sql/closing tables	10
 user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
-user2	localhost	stage/sql/starting	7
+user2	localhost	stage/sql/starting	8
 user3	localhost	stage/sql/checking permissions	4
 user3	localhost	stage/sql/closing tables	10
 user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
-user3	localhost	stage/sql/starting	7
+user3	localhost	stage/sql/starting	8
 user4	localhost	stage/sql/checking permissions	4
 user4	localhost	stage/sql/closing tables	10
 user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
-user4	localhost	stage/sql/starting	7
+user4	localhost	stage/sql/starting	8
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
@@ -2403,14 +2403,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2543,14 +2543,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2683,14 +2683,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2823,14 +2823,14 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2970,7 +2970,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3110,7 +3110,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3250,7 +3250,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3390,7 +3390,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3530,7 +3530,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3670,7 +3670,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3810,7 +3810,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3950,7 +3950,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4090,7 +4090,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4230,7 +4230,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4370,7 +4370,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4482,7 +4482,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4566,7 +4566,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4650,7 +4650,7 @@ stage/sql/checking permissions	16
 stage/sql/closing tables	41
 stage/sql/init	12
 stage/sql/Opening tables	25
-stage/sql/starting	28
+stage/sql/starting	32
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;

mysql-test/suite/perfschema/r/nesting.result

@@ -128,8 +128,8 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 11	11	stage/sql/Executing	(stage)	STATEMENT	0
 12	12	stage/sql/End of update loop	(stage)	STATEMENT	0
 13	13	stage/sql/Query end	(stage)	STATEMENT	0
-14	14	stage/sql/Commit	(stage)	STATEMENT	0
-15	15	stage/sql/closing tables	(stage)	STATEMENT	0
+14	14	stage/sql/closing tables	(stage)	STATEMENT	0
+15	15	stage/sql/Query end	(stage)	STATEMENT	0
 16	16	stage/sql/Starting cleanup	(stage)	STATEMENT	0
 17	17	stage/sql/Freeing items	(stage)	STATEMENT	0
 18	18	wait/io/socket/sql/client_connection	send	STATEMENT	0
@@ -152,8 +152,8 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 35	35	stage/sql/Executing	(stage)	STATEMENT	24
 36	36	stage/sql/End of update loop	(stage)	STATEMENT	24
 37	37	stage/sql/Query end	(stage)	STATEMENT	24
-38	38	stage/sql/Commit	(stage)	STATEMENT	24
-39	39	stage/sql/closing tables	(stage)	STATEMENT	24
+38	38	stage/sql/closing tables	(stage)	STATEMENT	24
+39	39	stage/sql/Query end	(stage)	STATEMENT	24
 40	40	stage/sql/Starting cleanup	(stage)	STATEMENT	24
 41	41	stage/sql/Freeing items	(stage)	STATEMENT	24
 42	42	wait/io/socket/sql/client_connection	send	STATEMENT	24
@@ -176,8 +176,8 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 59	59	stage/sql/Executing	(stage)	STATEMENT	48
 60	60	stage/sql/End of update loop	(stage)	STATEMENT	48
 61	61	stage/sql/Query end	(stage)	STATEMENT	48
-62	62	stage/sql/Commit	(stage)	STATEMENT	48
-63	63	stage/sql/closing tables	(stage)	STATEMENT	48
+62	62	stage/sql/closing tables	(stage)	STATEMENT	48
+63	63	stage/sql/Query end	(stage)	STATEMENT	48
 64	64	stage/sql/Starting cleanup	(stage)	STATEMENT	48
 65	65	stage/sql/Freeing items	(stage)	STATEMENT	48
 66	66	wait/io/socket/sql/client_connection	send	STATEMENT	48
@@ -203,8 +203,8 @@ select "With a third part to make things complete" as payload	NULL	NULL
 84	84	stage/sql/Executing	(stage)	STATEMENT	72
 85	85	stage/sql/End of update loop	(stage)	STATEMENT	72
 86	86	stage/sql/Query end	(stage)	STATEMENT	72
-87	87	stage/sql/Commit	(stage)	STATEMENT	72
-88	88	stage/sql/closing tables	(stage)	STATEMENT	72
+87	87	stage/sql/closing tables	(stage)	STATEMENT	72
+88	88	stage/sql/Query end	(stage)	STATEMENT	72
 89	89	stage/sql/Starting cleanup	(stage)	STATEMENT	72
 90	92	stage/sql/Freeing items	(stage)	STATEMENT	72
 91	91	wait/io/socket/sql/client_connection	send	STAGE	90
@@ -222,8 +222,8 @@ select "With a third part to make things complete" as payload	NULL	NULL
 102	102	stage/sql/Executing	(stage)	STATEMENT	93
 103	103	stage/sql/End of update loop	(stage)	STATEMENT	93
 104	104	stage/sql/Query end	(stage)	STATEMENT	93
-105	105	stage/sql/Commit	(stage)	STATEMENT	93
-106	106	stage/sql/closing tables	(stage)	STATEMENT	93
+105	105	stage/sql/closing tables	(stage)	STATEMENT	93
+106	106	stage/sql/Query end	(stage)	STATEMENT	93
 107	107	stage/sql/Starting cleanup	(stage)	STATEMENT	93
 108	110	stage/sql/Freeing items	(stage)	STATEMENT	93
 109	109	wait/io/socket/sql/client_connection	send	STAGE	108
@@ -239,8 +239,8 @@ select "With a third part to make things complete" as payload	NULL	NULL
 119	119	stage/sql/Executing	(stage)	STATEMENT	111
 120	120	stage/sql/End of update loop	(stage)	STATEMENT	111
 121	121	stage/sql/Query end	(stage)	STATEMENT	111
-122	122	stage/sql/Commit	(stage)	STATEMENT	111
-123	123	stage/sql/closing tables	(stage)	STATEMENT	111
+122	122	stage/sql/closing tables	(stage)	STATEMENT	111
+123	123	stage/sql/Query end	(stage)	STATEMENT	111
 124	124	stage/sql/Starting cleanup	(stage)	STATEMENT	111
 125	125	stage/sql/Freeing items	(stage)	STATEMENT	111
 126	126	wait/io/socket/sql/client_connection	send	STATEMENT	111
@@ -263,8 +263,8 @@ select "With a third part to make things complete" as payload	NULL	NULL
 143	143	stage/sql/Executing	(stage)	STATEMENT	132
 144	144	stage/sql/End of update loop	(stage)	STATEMENT	132
 145	145	stage/sql/Query end	(stage)	STATEMENT	132
-146	146	stage/sql/Commit	(stage)	STATEMENT	132
-147	147	stage/sql/closing tables	(stage)	STATEMENT	132
+146	146	stage/sql/closing tables	(stage)	STATEMENT	132
+147	147	stage/sql/Query end	(stage)	STATEMENT	132
 148	148	stage/sql/Starting cleanup	(stage)	STATEMENT	132
 149	149	stage/sql/Freeing items	(stage)	STATEMENT	132
 150	150	wait/io/socket/sql/client_connection	send	STATEMENT	132

mysql-test/suite/perfschema/r/stage_mdl_global.result

@@ -10,10 +10,10 @@ username	event_name	nesting_event_type
 username	event_name	nesting_event_type
 user1	stage/sql/starting	STATEMENT
 user1	stage/sql/starting	STATEMENT
+user1	stage/sql/starting	STATEMENT
 user1	stage/sql/Query end	STATEMENT
-user1	stage/sql/Commit	STATEMENT
 user1	stage/sql/closing tables	STATEMENT
-user1	stage/sql/Commit implicit	STATEMENT
+user1	stage/sql/Query end	STATEMENT
 user1	stage/sql/Starting cleanup	STATEMENT
 user1	stage/sql/Freeing items	STATEMENT
 user1	stage/sql/Reset for next command	STATEMENT

mysql-test/suite/perfschema/r/stage_mdl_table.result

@@ -19,10 +19,10 @@ username	event_name	nesting_event_type
 user1	stage/sql/Sending data	STATEMENT
 user1	stage/sql/End of update loop	STATEMENT
 user1	stage/sql/Query end	STATEMENT
-user1	stage/sql/Commit	STATEMENT
 user1	stage/sql/closing tables	STATEMENT
 user1	stage/sql/Unlocking tables	STATEMENT
 user1	stage/sql/closing tables	STATEMENT
+user1	stage/sql/Query end	STATEMENT
 user1	stage/sql/Starting cleanup	STATEMENT
 user1	stage/sql/Freeing items	STATEMENT
 user1	stage/sql/Reset for next command	STATEMENT

mysql-test/suite/perfschema/r/threads_history.result

@@ -167,16 +167,16 @@ stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 EVENT_NAME
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
@@ -189,29 +189,29 @@ stage/sql/Optimizing
 stage/sql/Executing
 stage/sql/End of update loop
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
@@ -585,16 +585,16 @@ stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 EVENT_NAME
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
@@ -607,29 +607,29 @@ stage/sql/Optimizing
 stage/sql/Executing
 stage/sql/End of update loop
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/Query end
-stage/sql/Commit
 stage/sql/closing tables
+stage/sql/Query end
 stage/sql/Starting cleanup
 stage/sql/Freeing items
 stage/sql/Reset for next command