From c9f612dbdefc24f4fb4236b5e586e30f6e69b6bc Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sun, 5 Nov 2017 17:04:20 +0200
Subject: Add more execution stages (commit, rollback, etc)

This was done to get more information about where time is spent.
Now we can get proper timing for time spent in commit, rollback,
binlog write etc.

Following stages was added:
- Commit
- Commit_implicit
- Rollback
- Rollback implicit
- Binlog write
- Init for update
  - This is used instead of "Init" for insert, update and delete.
- Staring cleanup

Following stages where changed:
- "Unlocking tables" stage reset stage to previous stage at end
- "binlog write" stage resets stage to previous stage at end
- "end" -> "end of update loop"
- "cleaning up" -> "Reset for next command"
- Added stage_searching_rows_for_update when searching for rows
  to be deleted.

Other things:
- Renamed all stages to start with big letter (before there was no
  consitency)
- Increased performance_schema_max_stage_classes from 150 to 160.
- Most of the test changes in performance schema comes from renaming of
  stages.
- Removed duplicate output of variables and inital state in a lot of
  performance schema tests.
  This was done to make it easier to change a default value for a
  performance variable without affecting all tests.
- Added start_server_variables.test to check configuration
- Removed some duplicate "closing tables" stages
- Updated position for "stage_init_update" and "stage_updating" for
  delete, insert and update to be just before update loop (for more
  exact timing).
- Don't set "Checking permissions" twice in a row.
- Remove stage_end stage from creating views (not done for create table
  either).
- Updated default performance history size from 10 to 20 because of new
  stages
- Ensure that ps_enabled is correct (to be used in a later patch)
---
 .../funcs_1/r/processlist_priv_no_prot.result      |   24 +-
 .../suite/funcs_1/r/processlist_priv_ps.result     |   24 +-
 .../suite/funcs_1/r/processlist_val_no_prot.result |   10 +-
 .../suite/funcs_1/r/processlist_val_ps.result      |   10 +-
 mysql-test/suite/galera/t/galera_gcs_fc_limit.test |    2 +-
 .../t/galera_var_innodb_disallow_writes.test       |    2 +-
 .../perfschema/include/event_aggregate_setup.inc   |   16 +-
 .../perfschema/include/start_server_common.inc     |    7 +-
 .../perfschema/include/table_aggregate_load.inc    |   11 +-
 .../suite/perfschema/r/event_aggregate.result      | 2009 +++++++++++---------
 .../suite/perfschema/r/event_aggregate_no_a.result | 1337 +++++++------
 .../perfschema/r/event_aggregate_no_a_no_h.result  | 1120 ++++++-----
 .../perfschema/r/event_aggregate_no_a_no_u.result  |  637 ++++---
 .../r/event_aggregate_no_a_no_u_no_h.result        |  420 ++--
 .../suite/perfschema/r/event_aggregate_no_h.result | 1792 +++++++++--------
 .../suite/perfschema/r/event_aggregate_no_u.result | 1309 +++++++------
 .../perfschema/r/event_aggregate_no_u_no_h.result  | 1092 ++++++-----
 mysql-test/suite/perfschema/r/nesting.result       |  266 +--
 mysql-test/suite/perfschema/r/ortho_iter.result    |    2 +-
 .../suite/perfschema/r/privilege_table_io.result   |    2 +-
 .../perfschema/r/setup_instruments_defaults.result |    2 +-
 .../suite/perfschema/r/sizing_default.result       |    2 +-
 mysql-test/suite/perfschema/r/sizing_high.result   |    2 +-
 mysql-test/suite/perfschema/r/sizing_low.result    |    2 +-
 mysql-test/suite/perfschema/r/sizing_med.result    |    2 +-
 mysql-test/suite/perfschema/r/sizing_off.result    |    2 +-
 .../suite/perfschema/r/stage_mdl_function.result   |   20 +-
 .../suite/perfschema/r/stage_mdl_global.result     |   20 +-
 .../suite/perfschema/r/stage_mdl_procedure.result  |   20 +-
 .../suite/perfschema/r/stage_mdl_table.result      |   27 +-
 .../perfschema/r/start_server_disable_idle.result  |   87 -
 .../r/start_server_disable_stages.result           |   87 -
 .../r/start_server_disable_statements.result       |   87 -
 .../perfschema/r/start_server_disable_waits.result |   87 -
 .../suite/perfschema/r/start_server_innodb.result  |   87 -
 .../perfschema/r/start_server_no_account.result    |   87 -
 .../perfschema/r/start_server_no_cond_class.result |   87 -
 .../perfschema/r/start_server_no_cond_inst.result  |   87 -
 .../perfschema/r/start_server_no_file_class.result |   87 -
 .../perfschema/r/start_server_no_file_inst.result  |   87 -
 .../suite/perfschema/r/start_server_no_host.result |   87 -
 .../r/start_server_no_mutex_class.result           |   87 -
 .../perfschema/r/start_server_no_mutex_inst.result |   87 -
 .../r/start_server_no_rwlock_class.result          |   87 -
 .../r/start_server_no_rwlock_inst.result           |   87 -
 .../r/start_server_no_setup_actors.result          |   87 -
 .../r/start_server_no_setup_objects.result         |   87 -
 .../r/start_server_no_socket_class.result          |   87 -
 .../r/start_server_no_socket_inst.result           |   87 -
 .../r/start_server_no_stage_class.result           |   87 -
 .../r/start_server_no_stages_history.result        |   87 -
 .../r/start_server_no_stages_history_long.result   |   87 -
 .../r/start_server_no_statement_class.result       |   87 -
 .../r/start_server_no_statements_history.result    |   87 -
 .../start_server_no_statements_history_long.result |   87 -
 .../perfschema/r/start_server_no_table_hdl.result  |   87 -
 .../perfschema/r/start_server_no_table_inst.result |   87 -
 .../r/start_server_no_thread_class.result          |   87 -
 .../r/start_server_no_thread_inst.result           |   87 -
 .../suite/perfschema/r/start_server_no_user.result |   87 -
 .../r/start_server_no_waits_history.result         |   87 -
 .../r/start_server_no_waits_history_long.result    |   87 -
 .../suite/perfschema/r/start_server_nothing.result |   87 -
 .../suite/perfschema/r/start_server_off.result     |   90 +-
 .../suite/perfschema/r/start_server_on.result      |   87 -
 .../perfschema/r/start_server_variables.result     |   56 +
 .../r/table_aggregate_global_2u_2t.result          |   60 -
 .../r/table_aggregate_global_2u_3t.result          |   60 -
 .../r/table_aggregate_global_4u_2t.result          |   60 -
 .../r/table_aggregate_global_4u_3t.result          |   60 -
 .../perfschema/r/table_aggregate_hist_2u_2t.result |   60 -
 .../perfschema/r/table_aggregate_hist_2u_3t.result |   60 -
 .../perfschema/r/table_aggregate_hist_4u_2t.result |   60 -
 .../perfschema/r/table_aggregate_hist_4u_3t.result |   60 -
 .../suite/perfschema/r/table_aggregate_off.result  |   60 -
 .../r/table_aggregate_thread_2u_2t.result          |   60 -
 .../r/table_aggregate_thread_2u_3t.result          |   60 -
 .../r/table_aggregate_thread_4u_2t.result          |   60 -
 .../r/table_aggregate_thread_4u_3t.result          |   60 -
 .../r/table_io_aggregate_global_2u_2t.result       |   60 -
 .../r/table_io_aggregate_global_2u_3t.result       |   60 -
 .../r/table_io_aggregate_global_4u_2t.result       |   60 -
 .../r/table_io_aggregate_global_4u_3t.result       |   60 -
 .../r/table_io_aggregate_hist_2u_2t.result         |   60 -
 .../r/table_io_aggregate_hist_2u_3t.result         |   60 -
 .../r/table_io_aggregate_hist_4u_2t.result         |   60 -
 .../r/table_io_aggregate_hist_4u_3t.result         |   60 -
 .../r/table_io_aggregate_thread_2u_2t.result       |   60 -
 .../r/table_io_aggregate_thread_2u_3t.result       |   60 -
 .../r/table_io_aggregate_thread_4u_2t.result       |   60 -
 .../r/table_io_aggregate_thread_4u_3t.result       |   60 -
 .../r/table_lock_aggregate_global_2u_2t.result     |   60 -
 .../r/table_lock_aggregate_global_2u_3t.result     |   60 -
 .../r/table_lock_aggregate_global_4u_2t.result     |   60 -
 .../r/table_lock_aggregate_global_4u_3t.result     |   60 -
 .../r/table_lock_aggregate_hist_2u_2t.result       |   60 -
 .../r/table_lock_aggregate_hist_2u_3t.result       |   60 -
 .../r/table_lock_aggregate_hist_4u_2t.result       |   60 -
 .../r/table_lock_aggregate_hist_4u_3t.result       |   60 -
 .../r/table_lock_aggregate_thread_2u_2t.result     |   60 -
 .../r/table_lock_aggregate_thread_2u_3t.result     |   60 -
 .../r/table_lock_aggregate_thread_4u_2t.result     |   60 -
 .../r/table_lock_aggregate_thread_4u_3t.result     |   60 -
 .../suite/perfschema/t/start_server_off.test       |    3 +-
 .../suite/perfschema/t/start_server_variables.test |   11 +
 mysql-test/suite/perfschema_stress/t/read.test     |    1 +
 .../sys_vars/r/sysvars_server_embedded.result      |    4 +-
 .../sys_vars/r/sysvars_server_notembedded.result   |    4 +-
 108 files changed, 5872 insertions(+), 9666 deletions(-)
 create mode 100644 mysql-test/suite/perfschema/r/start_server_variables.result
 create mode 100644 mysql-test/suite/perfschema/t/start_server_variables.test

(limited to 'mysql-test/suite')

diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
index 748a0bee927..5dd432714ab 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
@@ -45,7 +45,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	root	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
@@ -125,7 +125,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM processlist  ORDER BY id	TID
@@ -190,7 +190,7 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -206,7 +206,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -233,7 +233,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID		HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID		HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -259,7 +259,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -303,7 +303,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -331,7 +331,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -390,7 +390,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -421,7 +421,7 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -452,7 +452,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -490,7 +490,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
index b2da206debb..6ade94dbe58 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
@@ -45,7 +45,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	root	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
@@ -125,7 +125,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM processlist  ORDER BY id	TID
@@ -190,7 +190,7 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -206,7 +206,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -233,7 +233,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID		HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID		HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -259,7 +259,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -303,7 +303,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -331,7 +331,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -390,7 +390,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -421,7 +421,7 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -452,7 +452,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
@@ -490,7 +490,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist	TIME_MS
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	Init	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_USED	MAX_MEMORY_USED	EXAMINED_ROWS	QUERY_ID	INFO_BINARY	TID
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000	MEMORY	MAX_MEMORY	ROWS	QUERY_ID	SELECT * FROM information_schema.processlist	TID
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
index 59b20220d08..ad109501f98 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
@@ -39,7 +39,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST	<TIME_MS>
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	Init	SHOW FULL PROCESSLIST	<TIME_MS>
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -85,7 +85,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	<STATE>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -117,7 +117,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -133,7 +133,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 connection default;
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE ID <> @test_user_con1_id
@@ -156,7 +156,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17	0.000
 SELECT STATE, TIME, INFO INTO @state, @time, @info
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
index cd59b03c07d..169053cb6be 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
@@ -39,7 +39,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	test	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST	<TIME_MS>
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	Init	SHOW FULL PROCESSLIST	<TIME_MS>
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -85,7 +85,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	<STATE>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -117,7 +117,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -133,7 +133,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 connection default;
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE ID <> @test_user_con1_id
@@ -156,7 +156,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS	MEMORY_
 <ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000	<MEMORY>	<MAX_MEMORY>	<ROWS>	<QUERY_ID>	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TID>
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST	0.000
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	Init	SHOW FULL PROCESSLIST	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17	0.000
 SELECT STATE, TIME, INFO INTO @state, @time, @info
diff --git a/mysql-test/suite/galera/t/galera_gcs_fc_limit.test b/mysql-test/suite/galera/t/galera_gcs_fc_limit.test
index 61576a39316..5d341533161 100644
--- a/mysql-test/suite/galera/t/galera_gcs_fc_limit.test
+++ b/mysql-test/suite/galera/t/galera_gcs_fc_limit.test
@@ -36,7 +36,7 @@ INSERT INTO t1 VALUES (5);
 --let $galera_server_number = 1
 --source include/galera_connect.inc
 --connection node_1a
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'query end' AND INFO = 'INSERT INTO t1 VALUES (5)';
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = 'Commit' AND INFO = 'INSERT INTO t1 VALUES (5)';
 --source include/wait_condition.inc
 
 --connection node_2
diff --git a/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test b/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test
index c08483b63ad..3606075e7a8 100644
--- a/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test
+++ b/mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test
@@ -18,7 +18,7 @@ SET GLOBAL innodb_disallow_writes=ON;
 --send INSERT INTO t1 VALUES (1);
 
 --connection node_1a
-let $wait_condition = SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = 'INSERT INTO t1 VALUES (1)' AND State = 'query end';
+let $wait_condition = SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = 'INSERT INTO t1 VALUES (1)' AND State = 'Commit';
 --source include/wait_condition.inc
 
 SET GLOBAL innodb_disallow_writes=OFF;
diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
index 7dfefd25235..f116b09ff04 100644
--- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
@@ -118,10 +118,10 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'
                  'idle');
 
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
-  where name in ('stage/sql/init',
-                 'stage/sql/checking permissions',
+  where name in ('stage/sql/Init', 'stage/sql/Init for update',
+                 'stage/sql/Checking permissions',
                  'stage/sql/Opening tables',
-                 'stage/sql/closing tables');
+                 'stage/sql/Closing tables');
 
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
   where name in ('statement/sql/select',
@@ -247,7 +247,7 @@ prepare dump_stages_account from
   "select user, host, event_name, count_star
   from performance_schema.events_stages_summary_by_account_by_event_name
   where user like \'user%\'
-  and event_name in ('stage/sql/init',
+  and event_name in ('stage/sql/init', 'stage/sql/Init for update',
                      'stage/sql/checking permissions',
                      'stage/sql/Opening tables',
                      'stage/sql/closing tables')
@@ -257,7 +257,7 @@ prepare dump_stages_user from
   "select user, event_name, count_star
   from performance_schema.events_stages_summary_by_user_by_event_name
   where user like \'user%\'
-  and event_name in ('stage/sql/init',
+  and event_name in ('stage/sql/init', 'stage/sql/Init for update',
                      'stage/sql/checking permissions',
                      'stage/sql/Opening tables',
                      'stage/sql/closing tables')
@@ -267,7 +267,7 @@ prepare dump_stages_host from
   "select host, event_name, count_star
   from performance_schema.events_stages_summary_by_host_by_event_name
   where host=\'localhost\'
-  and event_name in ('stage/sql/init',
+  and event_name in ('stage/sql/init', 'stage/sql/Init for update',
                      'stage/sql/checking permissions',
                      'stage/sql/Opening tables',
                      'stage/sql/closing tables')
@@ -276,7 +276,7 @@ prepare dump_stages_host from
 prepare dump_stages_global from
   "select event_name, count_star
   from performance_schema.events_stages_summary_global_by_event_name
-  where event_name in ('stage/sql/init',
+  where event_name in ('stage/sql/init', 'stage/sql/Init for update',
                        'stage/sql/checking permissions',
                        'stage/sql/Opening tables',
                        'stage/sql/closing tables')
@@ -285,7 +285,7 @@ prepare dump_stages_global from
 prepare dump_stages_history from
   "select event_name, count(event_name)
   from performance_schema.events_stages_history_long
-  where event_name in ('stage/sql/init',
+  where event_name in ('stage/sql/init', 'stage/sql/Init for update',
                        'stage/sql/checking permissions',
                        'stage/sql/Opening tables',
                        'stage/sql/closing tables')
diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc
index 41dcfd8ecb5..8cbd40c2bc1 100644
--- a/mysql-test/suite/perfschema/include/start_server_common.inc
+++ b/mysql-test/suite/perfschema/include/start_server_common.inc
@@ -13,6 +13,7 @@ select count(*) from performance_schema.setup_timers;
 # Make sure we don't crash, no matter what the starting parameters are
 
 --disable_result_log
+--disable_query_log
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -66,11 +67,7 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 --enable_result_log
-
-# This has a stable output, printing the result:
-show variables where
-    `Variable_name` != "performance_schema_max_statement_classes" and
-    `Variable_name` like "performance_schema%";
+--enable_query_log
 
 # This has an unrepeatable output, it does depends too much on
 # - the platform hardware (sizeof structures, padding)
diff --git a/mysql-test/suite/perfschema/include/table_aggregate_load.inc b/mysql-test/suite/perfschema/include/table_aggregate_load.inc
index ae548d11627..80c622d77be 100644
--- a/mysql-test/suite/perfschema/include/table_aggregate_load.inc
+++ b/mysql-test/suite/perfschema/include/table_aggregate_load.inc
@@ -29,10 +29,12 @@ truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
 
 # Check the configuration is ok
-show variables where
-    `Variable_name` != "performance_schema_max_statement_classes" and
-    `Variable_name` like "performance_schema%";
-show status like "performance_schema%";
+# We don't print this as it causes too many changes in test cases if
+# one variable changes value
+#show variables where
+#    `Variable_name` != "performance_schema_max_statement_classes" and
+#    `Variable_name` like "performance_schema%";
+#show status like "performance_schema%";
 
 echo "================== Step 1 ==================";
 call dump_thread();
@@ -493,4 +495,3 @@ execute dump_objects_summary;
 
 # On test failures, may help to track the root cause
 show status like "performance_schema%";
-
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result
index 1f168cee431..9ab62329fc9 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate.result
@@ -32,15 +32,17 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -115,27 +117,31 @@ event_name	count(event_name)
 wait/io/file/sql/query_log	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -228,33 +234,38 @@ wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -351,41 +362,48 @@ wait/io/file/sql/query_log	5
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -499,41 +517,48 @@ wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -651,49 +676,58 @@ wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -828,49 +862,58 @@ wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1009,57 +1052,68 @@ wait/io/file/sql/query_log	13
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1215,57 +1269,68 @@ wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	24
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	20
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1412,57 +1477,68 @@ wait/synch/mutex/sql/LOCK_connection_count	1
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	25
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	21
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1607,57 +1683,68 @@ wait/synch/mutex/sql/LOCK_connection_count	2
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	26
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	22
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1799,57 +1886,68 @@ wait/synch/mutex/sql/LOCK_connection_count	3
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	27
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	23
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1988,57 +2086,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2178,57 +2287,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2367,57 +2487,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2556,57 +2687,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2745,57 +2887,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2934,57 +3087,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3123,57 +3287,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3312,57 +3487,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3501,57 +3687,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3690,57 +3887,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3879,57 +4087,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4068,57 +4287,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4257,57 +4487,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4446,57 +4687,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4635,57 +4887,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4824,57 +5087,68 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4999,39 +5273,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -5122,21 +5403,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -5207,21 +5491,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
index 7c9c3794d5f..ece0402335d 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -32,15 +32,17 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -112,21 +114,24 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -211,27 +216,31 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -316,31 +325,36 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -437,31 +451,36 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -558,35 +577,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -695,35 +720,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -832,39 +863,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -985,39 +1023,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	24
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	20
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1129,39 +1174,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	25
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	21
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1271,39 +1323,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	26
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	22
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1410,39 +1469,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	27
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	23
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1546,39 +1612,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1683,39 +1756,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1819,39 +1899,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1955,39 +2042,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2091,39 +2185,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2227,39 +2328,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2363,39 +2471,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2499,39 +2614,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2635,39 +2757,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2771,39 +2900,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2907,39 +3043,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3043,39 +3186,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3179,39 +3329,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3315,39 +3472,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3451,39 +3615,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3587,39 +3758,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3723,39 +3901,46 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3845,21 +4030,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3929,21 +4117,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
index c8a9233e2a6..083e1bffdd2 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
@@ -30,9 +30,10 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -95,17 +96,19 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -181,23 +184,26 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -273,27 +279,31 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -381,27 +391,31 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -489,31 +503,36 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -613,31 +632,36 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -737,35 +761,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -877,35 +907,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1008,35 +1044,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1137,35 +1179,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1263,35 +1311,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1386,35 +1440,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1510,35 +1570,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1633,35 +1699,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1756,35 +1828,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1879,35 +1957,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2002,35 +2086,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2125,35 +2215,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2248,35 +2344,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2371,35 +2473,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2494,35 +2602,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2617,35 +2731,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2740,35 +2860,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2863,35 +2989,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2986,35 +3118,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3109,35 +3247,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3232,35 +3376,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3355,35 +3505,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3466,15 +3622,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3537,15 +3695,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
index 95b46de4b57..c9b2b768691 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
@@ -32,15 +32,17 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -109,15 +111,17 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -194,21 +198,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -281,21 +288,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -375,21 +385,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -465,21 +478,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -562,21 +578,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -655,21 +674,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -755,21 +777,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	24
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	20
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -846,21 +871,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	25
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	21
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -935,21 +963,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	26
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	22
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1021,21 +1052,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	27
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	23
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1104,21 +1138,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1188,21 +1225,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1271,21 +1311,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1354,21 +1397,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1437,21 +1483,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1520,21 +1569,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1603,21 +1655,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1686,21 +1741,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1769,21 +1827,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1852,21 +1913,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1935,21 +1999,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2018,21 +2085,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2101,21 +2171,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2184,21 +2257,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2267,21 +2343,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2350,21 +2429,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2433,21 +2515,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2516,21 +2601,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2599,21 +2687,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
index 2dda100704f..89443515f31 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
@@ -30,9 +30,10 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -94,9 +95,10 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -166,15 +168,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -240,15 +244,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -321,15 +327,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -398,15 +406,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -482,15 +492,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -562,15 +574,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -649,15 +663,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -727,15 +743,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -803,15 +821,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -876,15 +896,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -946,15 +968,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1017,15 +1041,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1087,15 +1113,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1157,15 +1185,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1227,15 +1257,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1297,15 +1329,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1367,15 +1401,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1437,15 +1473,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1507,15 +1545,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1577,15 +1617,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1647,15 +1689,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1717,15 +1761,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1787,15 +1833,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1857,15 +1905,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1927,15 +1977,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1997,15 +2049,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2067,15 +2121,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2137,15 +2193,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2207,15 +2265,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
index 86edcf225c7..0ea5d90ea41 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
@@ -30,9 +30,10 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -98,23 +99,26 @@ event_name	count(event_name)
 wait/io/file/sql/query_log	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -198,29 +202,33 @@ wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -308,37 +316,43 @@ wait/io/file/sql/query_log	5
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -443,37 +457,43 @@ wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -582,45 +602,53 @@ wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -746,45 +774,53 @@ wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -914,53 +950,63 @@ wait/io/file/sql/query_log	13
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1107,53 +1153,63 @@ wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	6
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	5
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1291,53 +1347,63 @@ wait/synch/mutex/sql/LOCK_connection_count	1
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	6
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	5
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1473,53 +1539,63 @@ wait/synch/mutex/sql/LOCK_connection_count	2
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	6
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	5
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1652,53 +1728,63 @@ wait/synch/mutex/sql/LOCK_connection_count	3
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	6
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	5
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1828,53 +1914,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2005,53 +2101,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2181,53 +2287,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2357,53 +2473,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2533,53 +2659,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2709,53 +2845,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2885,53 +3031,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3061,53 +3217,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	3
-user1	stage/sql/closing tables	3
-user1	stage/sql/init	7
+user1	stage/sql/Checking permissions	3
+user1	stage/sql/Closing tables	4
+user1	stage/sql/Init	6
+user1	stage/sql/Init for update	1
 user1	stage/sql/Opening tables	3
-user2	stage/sql/checking permissions	3
-user2	stage/sql/closing tables	3
-user2	stage/sql/init	7
+user2	stage/sql/Checking permissions	3
+user2	stage/sql/Closing tables	4
+user2	stage/sql/Init	6
+user2	stage/sql/Init for update	1
 user2	stage/sql/Opening tables	3
-user3	stage/sql/checking permissions	3
-user3	stage/sql/closing tables	3
-user3	stage/sql/init	7
+user3	stage/sql/Checking permissions	3
+user3	stage/sql/Closing tables	4
+user3	stage/sql/Init	6
+user3	stage/sql/Init for update	1
 user3	stage/sql/Opening tables	3
-user4	stage/sql/checking permissions	3
-user4	stage/sql/closing tables	3
-user4	stage/sql/init	7
+user4	stage/sql/Checking permissions	3
+user4	stage/sql/Closing tables	4
+user4	stage/sql/Init	6
+user4	stage/sql/Init for update	1
 user4	stage/sql/Opening tables	3
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3237,53 +3403,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3413,53 +3589,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3589,53 +3775,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3765,53 +3961,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3941,53 +4147,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4117,53 +4333,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4293,53 +4519,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4469,53 +4705,63 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4631,35 +4877,41 @@ execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-user1	stage/sql/checking permissions	0
-user1	stage/sql/closing tables	0
-user1	stage/sql/init	0
+user1	stage/sql/Checking permissions	0
+user1	stage/sql/Closing tables	0
+user1	stage/sql/Init	0
+user1	stage/sql/Init for update	0
 user1	stage/sql/Opening tables	0
-user2	stage/sql/checking permissions	0
-user2	stage/sql/closing tables	0
-user2	stage/sql/init	0
+user2	stage/sql/Checking permissions	0
+user2	stage/sql/Closing tables	0
+user2	stage/sql/Init	0
+user2	stage/sql/Init for update	0
 user2	stage/sql/Opening tables	0
-user3	stage/sql/checking permissions	0
-user3	stage/sql/closing tables	0
-user3	stage/sql/init	0
+user3	stage/sql/Checking permissions	0
+user3	stage/sql/Closing tables	0
+user3	stage/sql/Init	0
+user3	stage/sql/Init for update	0
 user3	stage/sql/Opening tables	0
-user4	stage/sql/checking permissions	0
-user4	stage/sql/closing tables	0
-user4	stage/sql/init	0
+user4	stage/sql/Checking permissions	0
+user4	stage/sql/Closing tables	0
+user4	stage/sql/Init	0
+user4	stage/sql/Init for update	0
 user4	stage/sql/Opening tables	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4743,15 +4995,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4815,15 +5069,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
index f5c4044f40f..52c674024bd 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
@@ -32,15 +32,17 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -110,23 +112,26 @@ event_name	count(event_name)
 wait/io/file/sql/query_log	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -209,29 +214,33 @@ wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -314,33 +323,38 @@ wait/io/file/sql/query_log	5
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	3
-localhost	stage/sql/closing tables	3
-localhost	stage/sql/init	6
+localhost	stage/sql/Checking permissions	3
+localhost	stage/sql/Closing tables	4
+localhost	stage/sql/Init	5
+localhost	stage/sql/Init for update	1
 localhost	stage/sql/Opening tables	3
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -435,33 +449,38 @@ wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -556,37 +575,43 @@ wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	6
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	12
+localhost	stage/sql/Checking permissions	6
+localhost	stage/sql/Closing tables	8
+localhost	stage/sql/Init	10
+localhost	stage/sql/Init for update	2
 localhost	stage/sql/Opening tables	6
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -693,37 +718,43 @@ wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -830,41 +861,48 @@ wait/io/file/sql/query_log	13
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	9
-localhost	stage/sql/closing tables	9
-localhost	stage/sql/init	18
+localhost	stage/sql/Checking permissions	9
+localhost	stage/sql/Closing tables	12
+localhost	stage/sql/Init	15
+localhost	stage/sql/Init for update	3
 localhost	stage/sql/Opening tables	9
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -983,41 +1021,48 @@ wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	24
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	20
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1127,41 +1172,48 @@ wait/synch/mutex/sql/LOCK_connection_count	1
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	25
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	21
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1269,41 +1321,48 @@ wait/synch/mutex/sql/LOCK_connection_count	2
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	26
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	22
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1408,41 +1467,48 @@ wait/synch/mutex/sql/LOCK_connection_count	3
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	27
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	23
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1544,41 +1610,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1681,41 +1754,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1817,41 +1897,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1953,41 +2040,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2089,41 +2183,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2225,41 +2326,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2361,41 +2469,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2497,41 +2612,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2633,41 +2755,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	28
+localhost	stage/sql/Checking permissions	12
+localhost	stage/sql/Closing tables	16
+localhost	stage/sql/Init	24
+localhost	stage/sql/Init for update	4
 localhost	stage/sql/Opening tables	12
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2769,41 +2898,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2905,41 +3041,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3041,41 +3184,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3177,41 +3327,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3313,41 +3470,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3449,41 +3613,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3585,41 +3756,48 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3709,21 +3887,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3793,21 +3974,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3877,21 +4061,24 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/checking permissions	0
-localhost	stage/sql/closing tables	0
-localhost	stage/sql/init	0
+localhost	stage/sql/Checking permissions	0
+localhost	stage/sql/Closing tables	0
+localhost	stage/sql/Init	0
+localhost	stage/sql/Init for update	0
 localhost	stage/sql/Opening tables	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
index 5b40823e6ff..a493631d71f 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
@@ -30,9 +30,10 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -93,9 +94,10 @@ event_name	count(event_name)
 wait/io/file/sql/query_log	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -103,9 +105,10 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
@@ -179,9 +182,10 @@ wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -189,15 +193,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -271,13 +277,15 @@ wait/io/file/sql/query_log	5
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -285,15 +293,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	3
-stage/sql/closing tables	3
-stage/sql/init	6
+stage/sql/Checking permissions	3
+stage/sql/Closing tables	4
+stage/sql/Init	5
+stage/sql/Init for update	1
 stage/sql/Opening tables	3
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -379,13 +389,15 @@ wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -393,15 +405,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -487,17 +501,20 @@ wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -505,15 +522,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	6
-stage/sql/closing tables	6
-stage/sql/init	12
+stage/sql/Checking permissions	6
+stage/sql/Closing tables	8
+stage/sql/Init	10
+stage/sql/Init for update	2
 stage/sql/Opening tables	6
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -611,17 +630,20 @@ wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -629,15 +651,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -735,21 +759,25 @@ wait/io/file/sql/query_log	13
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -757,15 +785,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	9
-stage/sql/closing tables	9
-stage/sql/init	18
+stage/sql/Checking permissions	9
+stage/sql/Closing tables	12
+stage/sql/Init	15
+stage/sql/Init for update	3
 stage/sql/Opening tables	9
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -875,21 +905,25 @@ wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	6
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	5
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -897,15 +931,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	24
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	20
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1006,21 +1042,25 @@ wait/synch/mutex/sql/LOCK_connection_count	1
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	6
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	5
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1028,15 +1068,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	25
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	21
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1135,21 +1177,25 @@ wait/synch/mutex/sql/LOCK_connection_count	2
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	6
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	5
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1157,15 +1203,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	26
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	22
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1261,21 +1309,25 @@ wait/synch/mutex/sql/LOCK_connection_count	3
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	6
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	5
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1283,15 +1335,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	27
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	23
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1384,21 +1438,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1406,15 +1464,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1508,21 +1568,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1530,15 +1594,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1631,21 +1697,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1653,15 +1723,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1754,21 +1826,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1776,15 +1852,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -1877,21 +1955,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -1899,15 +1981,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2000,21 +2084,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -2022,15 +2110,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2123,21 +2213,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	3
-user1	localhost	stage/sql/closing tables	3
-user1	localhost	stage/sql/init	7
+user1	localhost	stage/sql/Checking permissions	3
+user1	localhost	stage/sql/Closing tables	4
+user1	localhost	stage/sql/Init	6
+user1	localhost	stage/sql/Init for update	1
 user1	localhost	stage/sql/Opening tables	3
-user2	localhost	stage/sql/checking permissions	3
-user2	localhost	stage/sql/closing tables	3
-user2	localhost	stage/sql/init	7
+user2	localhost	stage/sql/Checking permissions	3
+user2	localhost	stage/sql/Closing tables	4
+user2	localhost	stage/sql/Init	6
+user2	localhost	stage/sql/Init for update	1
 user2	localhost	stage/sql/Opening tables	3
-user3	localhost	stage/sql/checking permissions	3
-user3	localhost	stage/sql/closing tables	3
-user3	localhost	stage/sql/init	7
+user3	localhost	stage/sql/Checking permissions	3
+user3	localhost	stage/sql/Closing tables	4
+user3	localhost	stage/sql/Init	6
+user3	localhost	stage/sql/Init for update	1
 user3	localhost	stage/sql/Opening tables	3
-user4	localhost	stage/sql/checking permissions	3
-user4	localhost	stage/sql/closing tables	3
-user4	localhost	stage/sql/init	7
+user4	localhost	stage/sql/Checking permissions	3
+user4	localhost	stage/sql/Closing tables	4
+user4	localhost	stage/sql/Init	6
+user4	localhost	stage/sql/Init for update	1
 user4	localhost	stage/sql/Opening tables	3
 execute dump_stages_user;
 user	event_name	count_star
@@ -2145,15 +2239,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2246,21 +2342,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -2268,15 +2368,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2369,21 +2471,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -2391,15 +2497,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2492,21 +2600,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -2514,15 +2626,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2615,21 +2729,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -2637,15 +2755,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2738,21 +2858,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -2760,15 +2884,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2861,21 +2987,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -2883,15 +3013,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -2984,21 +3116,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -3006,15 +3142,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3107,21 +3245,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -3129,15 +3271,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3230,21 +3374,25 @@ wait/synch/mutex/sql/LOCK_connection_count	4
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/checking permissions	0
-user1	localhost	stage/sql/closing tables	0
-user1	localhost	stage/sql/init	0
+user1	localhost	stage/sql/Checking permissions	0
+user1	localhost	stage/sql/Closing tables	0
+user1	localhost	stage/sql/Init	0
+user1	localhost	stage/sql/Init for update	0
 user1	localhost	stage/sql/Opening tables	0
-user2	localhost	stage/sql/checking permissions	0
-user2	localhost	stage/sql/closing tables	0
-user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Checking permissions	0
+user2	localhost	stage/sql/Closing tables	0
+user2	localhost	stage/sql/Init	0
+user2	localhost	stage/sql/Init for update	0
 user2	localhost	stage/sql/Opening tables	0
-user3	localhost	stage/sql/checking permissions	0
-user3	localhost	stage/sql/closing tables	0
-user3	localhost	stage/sql/init	0
+user3	localhost	stage/sql/Checking permissions	0
+user3	localhost	stage/sql/Closing tables	0
+user3	localhost	stage/sql/Init	0
+user3	localhost	stage/sql/Init for update	0
 user3	localhost	stage/sql/Opening tables	0
-user4	localhost	stage/sql/checking permissions	0
-user4	localhost	stage/sql/closing tables	0
-user4	localhost	stage/sql/init	0
+user4	localhost	stage/sql/Checking permissions	0
+user4	localhost	stage/sql/Closing tables	0
+user4	localhost	stage/sql/Init	0
+user4	localhost	stage/sql/Init for update	0
 user4	localhost	stage/sql/Opening tables	0
 execute dump_stages_user;
 user	event_name	count_star
@@ -3252,15 +3400,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3343,15 +3493,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3414,15 +3566,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3485,15 +3639,17 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/checking permissions	0
-stage/sql/closing tables	0
-stage/sql/init	0
+stage/sql/Checking permissions	0
+stage/sql/Closing tables	0
+stage/sql/Init	0
+stage/sql/Init for update	0
 stage/sql/Opening tables	0
 execute dump_stages_history;
 event_name	count(event_name)
-stage/sql/checking permissions	12
-stage/sql/closing tables	12
-stage/sql/init	28
+stage/sql/Checking permissions	12
+stage/sql/Closing tables	16
+stage/sql/Init	24
+stage/sql/Init for update	4
 stage/sql/Opening tables	12
 execute dump_statements_account;
 user	host	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result
index e08aec94845..78126d93cc7 100644
--- a/mysql-test/suite/perfschema/r/nesting.result
+++ b/mysql-test/suite/perfschema/r/nesting.result
@@ -107,138 +107,152 @@ and (end_event_id <= @marker_end)
 ) all_events
 order by relative_event_id asc;
 relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	relative_nesting_event_id
-0	18	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	4	stage/sql/init	(stage)	STATEMENT	0
+0	20	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
+1	4	stage/sql/Init	(stage)	STATEMENT	0
 2	2	wait/io/socket/sql/client_connection	recv	STAGE	1
 3	3	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	1
 4	4	wait/io/file/sql/query_log	write	STAGE	1
-5	5	stage/sql/checking permissions	(stage)	STATEMENT	0
+5	5	stage/sql/Checking permissions	(stage)	STATEMENT	0
 6	6	stage/sql/Opening tables	(stage)	STATEMENT	0
 7	7	stage/sql/After opening tables	(stage)	STATEMENT	0
-8	8	stage/sql/init	(stage)	STATEMENT	0
-9	9	stage/sql/optimizing	(stage)	STATEMENT	0
-10	10	stage/sql/executing	(stage)	STATEMENT	0
-11	11	stage/sql/end	(stage)	STATEMENT	0
-12	12	stage/sql/query end	(stage)	STATEMENT	0
-13	13	stage/sql/closing tables	(stage)	STATEMENT	0
-14	14	stage/sql/freeing items	(stage)	STATEMENT	0
-15	15	wait/io/socket/sql/client_connection	send	STATEMENT	0
-16	16	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	0
-17	18	stage/sql/cleaning up	(stage)	STATEMENT	0
-18	18	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	17
-19	19	idle	idle	NULL	NULL
-20	38	statement/sql/select	select "This is simple statement one" as payload	NULL	NULL
-21	24	stage/sql/init	(stage)	STATEMENT	20
-22	22	wait/io/socket/sql/client_connection	recv	STAGE	21
-23	23	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	21
-24	24	wait/io/file/sql/query_log	write	STAGE	21
-25	25	stage/sql/checking permissions	(stage)	STATEMENT	20
-26	26	stage/sql/Opening tables	(stage)	STATEMENT	20
-27	27	stage/sql/After opening tables	(stage)	STATEMENT	20
-28	28	stage/sql/init	(stage)	STATEMENT	20
-29	29	stage/sql/optimizing	(stage)	STATEMENT	20
-30	30	stage/sql/executing	(stage)	STATEMENT	20
-31	31	stage/sql/end	(stage)	STATEMENT	20
-32	32	stage/sql/query end	(stage)	STATEMENT	20
-33	33	stage/sql/closing tables	(stage)	STATEMENT	20
-34	34	stage/sql/freeing items	(stage)	STATEMENT	20
-35	35	wait/io/socket/sql/client_connection	send	STATEMENT	20
-36	36	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	20
-37	38	stage/sql/cleaning up	(stage)	STATEMENT	20
-38	38	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	37
-39	39	idle	idle	NULL	NULL
-40	58	statement/sql/select	select "This is simple statement two" as payload	NULL	NULL
-41	44	stage/sql/init	(stage)	STATEMENT	40
-42	42	wait/io/socket/sql/client_connection	recv	STAGE	41
-43	43	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	41
-44	44	wait/io/file/sql/query_log	write	STAGE	41
-45	45	stage/sql/checking permissions	(stage)	STATEMENT	40
-46	46	stage/sql/Opening tables	(stage)	STATEMENT	40
-47	47	stage/sql/After opening tables	(stage)	STATEMENT	40
-48	48	stage/sql/init	(stage)	STATEMENT	40
-49	49	stage/sql/optimizing	(stage)	STATEMENT	40
-50	50	stage/sql/executing	(stage)	STATEMENT	40
-51	51	stage/sql/end	(stage)	STATEMENT	40
-52	52	stage/sql/query end	(stage)	STATEMENT	40
-53	53	stage/sql/closing tables	(stage)	STATEMENT	40
-54	54	stage/sql/freeing items	(stage)	STATEMENT	40
-55	55	wait/io/socket/sql/client_connection	send	STATEMENT	40
-56	56	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	40
-57	58	stage/sql/cleaning up	(stage)	STATEMENT	40
-58	58	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	57
-59	59	idle	idle	NULL	NULL
-60	77	statement/sql/select	select "This is the first part of a multi query" as payload;
+8	8	stage/sql/Init	(stage)	STATEMENT	0
+9	9	stage/sql/Optimizing	(stage)	STATEMENT	0
+10	10	stage/sql/Executing	(stage)	STATEMENT	0
+11	11	stage/sql/End of update loop	(stage)	STATEMENT	0
+12	12	stage/sql/Query end	(stage)	STATEMENT	0
+13	13	stage/sql/Commit	(stage)	STATEMENT	0
+14	14	stage/sql/Closing tables	(stage)	STATEMENT	0
+15	15	stage/sql/Starting cleanup	(stage)	STATEMENT	0
+16	16	stage/sql/Freeing items	(stage)	STATEMENT	0
+17	17	wait/io/socket/sql/client_connection	send	STATEMENT	0
+18	18	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	0
+19	20	stage/sql/Reset for next command	(stage)	STATEMENT	0
+20	20	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	19
+21	21	idle	idle	NULL	NULL
+22	42	statement/sql/select	select "This is simple statement one" as payload	NULL	NULL
+23	26	stage/sql/Init	(stage)	STATEMENT	22
+24	24	wait/io/socket/sql/client_connection	recv	STAGE	23
+25	25	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	23
+26	26	wait/io/file/sql/query_log	write	STAGE	23
+27	27	stage/sql/Checking permissions	(stage)	STATEMENT	22
+28	28	stage/sql/Opening tables	(stage)	STATEMENT	22
+29	29	stage/sql/After opening tables	(stage)	STATEMENT	22
+30	30	stage/sql/Init	(stage)	STATEMENT	22
+31	31	stage/sql/Optimizing	(stage)	STATEMENT	22
+32	32	stage/sql/Executing	(stage)	STATEMENT	22
+33	33	stage/sql/End of update loop	(stage)	STATEMENT	22
+34	34	stage/sql/Query end	(stage)	STATEMENT	22
+35	35	stage/sql/Commit	(stage)	STATEMENT	22
+36	36	stage/sql/Closing tables	(stage)	STATEMENT	22
+37	37	stage/sql/Starting cleanup	(stage)	STATEMENT	22
+38	38	stage/sql/Freeing items	(stage)	STATEMENT	22
+39	39	wait/io/socket/sql/client_connection	send	STATEMENT	22
+40	40	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	22
+41	42	stage/sql/Reset for next command	(stage)	STATEMENT	22
+42	42	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	41
+43	43	idle	idle	NULL	NULL
+44	64	statement/sql/select	select "This is simple statement two" as payload	NULL	NULL
+45	48	stage/sql/Init	(stage)	STATEMENT	44
+46	46	wait/io/socket/sql/client_connection	recv	STAGE	45
+47	47	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	45
+48	48	wait/io/file/sql/query_log	write	STAGE	45
+49	49	stage/sql/Checking permissions	(stage)	STATEMENT	44
+50	50	stage/sql/Opening tables	(stage)	STATEMENT	44
+51	51	stage/sql/After opening tables	(stage)	STATEMENT	44
+52	52	stage/sql/Init	(stage)	STATEMENT	44
+53	53	stage/sql/Optimizing	(stage)	STATEMENT	44
+54	54	stage/sql/Executing	(stage)	STATEMENT	44
+55	55	stage/sql/End of update loop	(stage)	STATEMENT	44
+56	56	stage/sql/Query end	(stage)	STATEMENT	44
+57	57	stage/sql/Commit	(stage)	STATEMENT	44
+58	58	stage/sql/Closing tables	(stage)	STATEMENT	44
+59	59	stage/sql/Starting cleanup	(stage)	STATEMENT	44
+60	60	stage/sql/Freeing items	(stage)	STATEMENT	44
+61	61	wait/io/socket/sql/client_connection	send	STATEMENT	44
+62	62	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	44
+63	64	stage/sql/Reset for next command	(stage)	STATEMENT	44
+64	64	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	63
+65	65	idle	idle	NULL	NULL
+66	85	statement/sql/select	select "This is the first part of a multi query" as payload;
 select "And this is the second part of a multi query" as payload;
 select "With a third part to make things complete" as payload	NULL	NULL
-61	65	stage/sql/init	(stage)	STATEMENT	60
-62	62	wait/io/socket/sql/client_connection	recv	STAGE	61
-63	63	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	61
-64	64	wait/io/file/sql/query_log	write	STAGE	61
-65	65	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	61
-66	66	stage/sql/checking permissions	(stage)	STATEMENT	60
-67	67	stage/sql/Opening tables	(stage)	STATEMENT	60
-68	68	stage/sql/After opening tables	(stage)	STATEMENT	60
-69	69	stage/sql/init	(stage)	STATEMENT	60
-70	70	stage/sql/optimizing	(stage)	STATEMENT	60
-71	71	stage/sql/executing	(stage)	STATEMENT	60
-72	72	stage/sql/end	(stage)	STATEMENT	60
-73	73	stage/sql/query end	(stage)	STATEMENT	60
-74	74	stage/sql/closing tables	(stage)	STATEMENT	60
-75	77	stage/sql/freeing items	(stage)	STATEMENT	60
-76	76	wait/io/socket/sql/client_connection	send	STAGE	75
-77	77	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	75
-78	93	statement/sql/select	select "And this is the second part of a multi query" as payload;
+67	71	stage/sql/Init	(stage)	STATEMENT	66
+68	68	wait/io/socket/sql/client_connection	recv	STAGE	67
+69	69	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	67
+70	70	wait/io/file/sql/query_log	write	STAGE	67
+71	71	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	67
+72	72	stage/sql/Checking permissions	(stage)	STATEMENT	66
+73	73	stage/sql/Opening tables	(stage)	STATEMENT	66
+74	74	stage/sql/After opening tables	(stage)	STATEMENT	66
+75	75	stage/sql/Init	(stage)	STATEMENT	66
+76	76	stage/sql/Optimizing	(stage)	STATEMENT	66
+77	77	stage/sql/Executing	(stage)	STATEMENT	66
+78	78	stage/sql/End of update loop	(stage)	STATEMENT	66
+79	79	stage/sql/Query end	(stage)	STATEMENT	66
+80	80	stage/sql/Commit	(stage)	STATEMENT	66
+81	81	stage/sql/Closing tables	(stage)	STATEMENT	66
+82	82	stage/sql/Starting cleanup	(stage)	STATEMENT	66
+83	85	stage/sql/Freeing items	(stage)	STATEMENT	66
+84	84	wait/io/socket/sql/client_connection	send	STAGE	83
+85	85	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	83
+86	103	statement/sql/select	select "And this is the second part of a multi query" as payload;
 select "With a third part to make things complete" as payload	NULL	NULL
-79	81	stage/sql/init	(stage)	STATEMENT	78
-80	80	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	79
-81	81	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	79
-82	82	stage/sql/checking permissions	(stage)	STATEMENT	78
-83	83	stage/sql/Opening tables	(stage)	STATEMENT	78
-84	84	stage/sql/After opening tables	(stage)	STATEMENT	78
-85	85	stage/sql/init	(stage)	STATEMENT	78
-86	86	stage/sql/optimizing	(stage)	STATEMENT	78
-87	87	stage/sql/executing	(stage)	STATEMENT	78
-88	88	stage/sql/end	(stage)	STATEMENT	78
-89	89	stage/sql/query end	(stage)	STATEMENT	78
-90	90	stage/sql/closing tables	(stage)	STATEMENT	78
-91	93	stage/sql/freeing items	(stage)	STATEMENT	78
-92	92	wait/io/socket/sql/client_connection	send	STAGE	91
-93	93	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	91
-94	110	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
-95	96	stage/sql/init	(stage)	STATEMENT	94
-96	96	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	95
-97	97	stage/sql/checking permissions	(stage)	STATEMENT	94
-98	98	stage/sql/Opening tables	(stage)	STATEMENT	94
-99	99	stage/sql/After opening tables	(stage)	STATEMENT	94
-100	100	stage/sql/init	(stage)	STATEMENT	94
-101	101	stage/sql/optimizing	(stage)	STATEMENT	94
-102	102	stage/sql/executing	(stage)	STATEMENT	94
-103	103	stage/sql/end	(stage)	STATEMENT	94
-104	104	stage/sql/query end	(stage)	STATEMENT	94
-105	105	stage/sql/closing tables	(stage)	STATEMENT	94
-106	106	stage/sql/freeing items	(stage)	STATEMENT	94
-107	107	wait/io/socket/sql/client_connection	send	STATEMENT	94
-108	108	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	94
-109	110	stage/sql/cleaning up	(stage)	STATEMENT	94
-110	110	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	109
-111	111	idle	idle	NULL	NULL
-112	130	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
-113	116	stage/sql/init	(stage)	STATEMENT	112
-114	114	wait/io/socket/sql/client_connection	recv	STAGE	113
-115	115	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	113
-116	116	wait/io/file/sql/query_log	write	STAGE	113
-117	117	stage/sql/checking permissions	(stage)	STATEMENT	112
-118	118	stage/sql/Opening tables	(stage)	STATEMENT	112
-119	119	stage/sql/After opening tables	(stage)	STATEMENT	112
-120	120	stage/sql/init	(stage)	STATEMENT	112
-121	121	stage/sql/optimizing	(stage)	STATEMENT	112
-122	122	stage/sql/executing	(stage)	STATEMENT	112
-123	123	stage/sql/end	(stage)	STATEMENT	112
-124	124	stage/sql/query end	(stage)	STATEMENT	112
-125	125	stage/sql/closing tables	(stage)	STATEMENT	112
-126	126	stage/sql/freeing items	(stage)	STATEMENT	112
-127	127	wait/io/socket/sql/client_connection	send	STATEMENT	112
-128	128	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	112
-129	130	stage/sql/cleaning up	(stage)	STATEMENT	112
-130	130	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	129
+87	89	stage/sql/Init	(stage)	STATEMENT	86
+88	88	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	87
+89	89	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	87
+90	90	stage/sql/Checking permissions	(stage)	STATEMENT	86
+91	91	stage/sql/Opening tables	(stage)	STATEMENT	86
+92	92	stage/sql/After opening tables	(stage)	STATEMENT	86
+93	93	stage/sql/Init	(stage)	STATEMENT	86
+94	94	stage/sql/Optimizing	(stage)	STATEMENT	86
+95	95	stage/sql/Executing	(stage)	STATEMENT	86
+96	96	stage/sql/End of update loop	(stage)	STATEMENT	86
+97	97	stage/sql/Query end	(stage)	STATEMENT	86
+98	98	stage/sql/Commit	(stage)	STATEMENT	86
+99	99	stage/sql/Closing tables	(stage)	STATEMENT	86
+100	100	stage/sql/Starting cleanup	(stage)	STATEMENT	86
+101	103	stage/sql/Freeing items	(stage)	STATEMENT	86
+102	102	wait/io/socket/sql/client_connection	send	STAGE	101
+103	103	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	101
+104	122	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
+105	106	stage/sql/Init	(stage)	STATEMENT	104
+106	106	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	105
+107	107	stage/sql/Checking permissions	(stage)	STATEMENT	104
+108	108	stage/sql/Opening tables	(stage)	STATEMENT	104
+109	109	stage/sql/After opening tables	(stage)	STATEMENT	104
+110	110	stage/sql/Init	(stage)	STATEMENT	104
+111	111	stage/sql/Optimizing	(stage)	STATEMENT	104
+112	112	stage/sql/Executing	(stage)	STATEMENT	104
+113	113	stage/sql/End of update loop	(stage)	STATEMENT	104
+114	114	stage/sql/Query end	(stage)	STATEMENT	104
+115	115	stage/sql/Commit	(stage)	STATEMENT	104
+116	116	stage/sql/Closing tables	(stage)	STATEMENT	104
+117	117	stage/sql/Starting cleanup	(stage)	STATEMENT	104
+118	118	stage/sql/Freeing items	(stage)	STATEMENT	104
+119	119	wait/io/socket/sql/client_connection	send	STATEMENT	104
+120	120	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	104
+121	122	stage/sql/Reset for next command	(stage)	STATEMENT	104
+122	122	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	121
+123	123	idle	idle	NULL	NULL
+124	144	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
+125	128	stage/sql/Init	(stage)	STATEMENT	124
+126	126	wait/io/socket/sql/client_connection	recv	STAGE	125
+127	127	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	125
+128	128	wait/io/file/sql/query_log	write	STAGE	125
+129	129	stage/sql/Checking permissions	(stage)	STATEMENT	124
+130	130	stage/sql/Opening tables	(stage)	STATEMENT	124
+131	131	stage/sql/After opening tables	(stage)	STATEMENT	124
+132	132	stage/sql/Init	(stage)	STATEMENT	124
+133	133	stage/sql/Optimizing	(stage)	STATEMENT	124
+134	134	stage/sql/Executing	(stage)	STATEMENT	124
+135	135	stage/sql/End of update loop	(stage)	STATEMENT	124
+136	136	stage/sql/Query end	(stage)	STATEMENT	124
+137	137	stage/sql/Commit	(stage)	STATEMENT	124
+138	138	stage/sql/Closing tables	(stage)	STATEMENT	124
+139	139	stage/sql/Starting cleanup	(stage)	STATEMENT	124
+140	140	stage/sql/Freeing items	(stage)	STATEMENT	124
+141	141	wait/io/socket/sql/client_connection	send	STATEMENT	124
+142	142	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	124
+143	144	stage/sql/Reset for next command	(stage)	STATEMENT	124
+144	144	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	143
 disconnect con1;
diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result
index bb572237483..80897c22148 100644
--- a/mysql-test/suite/perfschema/r/ortho_iter.result
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result
@@ -120,7 +120,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes	160
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result
index b1bc1857b52..5443c178502 100644
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result
@@ -50,7 +50,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes	160
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
index b0570d70602..f31bb1a8b7a 100644
--- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
+++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
@@ -10,7 +10,7 @@ WHERE name IN (
 AND enabled = 'yes' AND timed = 'no'
 ORDER BY name;
 NAME	ENABLED	TIMED
-stage/sql/creating table	YES	NO
+stage/sql/Creating table	YES	NO
 wait/synch/mutex/sql/LOCK_plugin	YES	NO
 wait/synch/mutex/sql/LOCK_user_conn	YES	NO
 SELECT * FROM performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result
index 1ca202e821f..07fbf35619b 100644
--- a/mysql-test/suite/perfschema/r/sizing_default.result
+++ b/mysql-test/suite/perfschema/r/sizing_default.result
@@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	9102
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	322
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes\t160
 performance_schema_max_table_handles	4000
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result
index b633d5fce8d..1cf84a14d22 100644
--- a/mysql-test/suite/perfschema/r/sizing_high.result
+++ b/mysql-test/suite/perfschema/r/sizing_high.result
@@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	30800
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	420
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes\t160
 performance_schema_max_table_handles	800
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result
index a698f55aa07..4569ebd7a5e 100644
--- a/mysql-test/suite/perfschema/r/sizing_low.result
+++ b/mysql-test/suite/perfschema/r/sizing_low.result
@@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	1612
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	67
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes\t160
 performance_schema_max_table_handles	112
 performance_schema_max_table_instances	445
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result
index 2eda017467a..24fba02d16b 100644
--- a/mysql-test/suite/perfschema/r/sizing_med.result
+++ b/mysql-test/suite/perfschema/r/sizing_med.result
@@ -33,7 +33,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	2222
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	232
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes\t160
 performance_schema_max_table_handles	573
 performance_schema_max_table_instances	556
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result
index b4ca7b1b9be..e49a9824f42 100644
--- a/mysql-test/suite/perfschema/r/sizing_off.result
+++ b/mysql-test/suite/perfschema/r/sizing_off.result
@@ -24,7 +24,7 @@ performance_schema_max_rwlock_classes	40
 performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	-1
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes\t160
 performance_schema_max_table_handles	-1
 performance_schema_max_table_instances	-1
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_function.result b/mysql-test/suite/perfschema/r/stage_mdl_function.result
index eb72fa338aa..5f55dd6c28e 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_function.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_function.result
@@ -14,23 +14,23 @@ username	event_name	sql_text
 user1	statement/sql/select	select test.f1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/executing	STATEMENT
-user1	stage/sql/Opening tables	STATEMENT
-user1	stage/sql/After opening tables	STATEMENT
-user1	stage/sql/closing tables	STATEMENT
-user1	stage/sql/end	STATEMENT
-user1	stage/sql/query end	STATEMENT
-user1	stage/sql/closing tables	STATEMENT
+user1	stage/sql/Closing tables	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/freeing items	STATEMENT
-user1	stage/sql/cleaning up	STATEMENT
+user1	stage/sql/Closing tables	STATEMENT
+user1	stage/sql/Starting cleanup	STATEMENT
+user1	stage/sql/Freeing items	STATEMENT
+user1	stage/sql/Reset for next command	STATEMENT
 call dump_one_thread('user2');
 username	event_name	sql_text
 user2	statement/sql/drop_function	drop function test.f1
 username	event_name	nesting_event_type
 user2	stage/sql/Waiting for stored function metadata lock	STATEMENT
 username	event_name	nesting_event_type
-user2	stage/sql/init	STATEMENT
+user2	stage/sql/Init	STATEMENT
 connection con1;
 select f1();
 f1()
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result
index f82874bef74..7d15b250bd9 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_global.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result
@@ -8,22 +8,24 @@ username	event_name	sql_text
 user1	statement/sql/flush	flush tables with read lock
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/init	STATEMENT
-user1	stage/sql/init	STATEMENT
+user1	stage/sql/Init	STATEMENT
 user1	stage/sql/Waiting for query cache lock	STATEMENT
-user1	stage/sql/init	STATEMENT
-user1	stage/sql/query end	STATEMENT
-user1	stage/sql/closing tables	STATEMENT
-user1	stage/sql/freeing items	STATEMENT
-user1	stage/sql/cleaning up	STATEMENT
+user1	stage/sql/Init	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/Starting cleanup	STATEMENT
+user1	stage/sql/Freeing items	STATEMENT
+user1	stage/sql/Reset for next command	STATEMENT
 call dump_one_thread('user2');
 username	event_name	sql_text
 user2	statement/sql/insert	insert into test.t1 values (1), (2), (3)
 username	event_name	nesting_event_type
 user2	stage/sql/Waiting for global read lock	STATEMENT
 username	event_name	nesting_event_type
-user2	stage/sql/init	STATEMENT
-user2	stage/sql/checking permissions	STATEMENT
+user2	stage/sql/Init	STATEMENT
+user2	stage/sql/Checking permissions	STATEMENT
 user2	stage/sql/Opening tables	STATEMENT
 connection con1;
 unlock tables;
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
index 8f7e70bc740..6362f725b88 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
@@ -21,23 +21,23 @@ username	event_name	sql_text
 user1	statement/sql/select	select test.f1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/closing tables	STATEMENT
-user1	stage/sql/Opening tables	STATEMENT
-user1	stage/sql/After opening tables	STATEMENT
-user1	stage/sql/closing tables	STATEMENT
-user1	stage/sql/end	STATEMENT
-user1	stage/sql/query end	STATEMENT
-user1	stage/sql/closing tables	STATEMENT
+user1	stage/sql/Closing tables	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/freeing items	STATEMENT
-user1	stage/sql/cleaning up	STATEMENT
+user1	stage/sql/Closing tables	STATEMENT
+user1	stage/sql/Starting cleanup	STATEMENT
+user1	stage/sql/Freeing items	STATEMENT
+user1	stage/sql/Reset for next command	STATEMENT
 call dump_one_thread('user2');
 username	event_name	sql_text
 user2	statement/sql/drop_procedure	drop procedure test.p1
 username	event_name	nesting_event_type
 user2	stage/sql/Waiting for stored procedure metadata lock	STATEMENT
 username	event_name	nesting_event_type
-user2	stage/sql/init	STATEMENT
+user2	stage/sql/Init	STATEMENT
 connection con1;
 select test.f1();
 test.f1()
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result
index f7d519bedeb..c703e910891 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_table.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result
@@ -16,30 +16,29 @@ username	event_name	sql_text
 user1	statement/sql/select	select * from test.t1 for update
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/statistics	STATEMENT
-user1	stage/sql/preparing	STATEMENT
-user1	stage/sql/executing	STATEMENT
 user1	stage/sql/Sending data	STATEMENT
-user1	stage/sql/end	STATEMENT
-user1	stage/sql/query end	STATEMENT
-user1	stage/sql/closing tables	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/freeing items	STATEMENT
-user1	stage/sql/cleaning up	STATEMENT
+user1	stage/sql/Closing tables	STATEMENT
+user1	stage/sql/Starting cleanup	STATEMENT
+user1	stage/sql/Freeing items	STATEMENT
+user1	stage/sql/Reset for next command	STATEMENT
 call dump_one_thread('user2');
 username	event_name	sql_text
 user2	statement/sql/alter_table	alter table test.t1 add column (b int)
 username	event_name	nesting_event_type
 user2	stage/sql/Waiting for table metadata lock	STATEMENT
 username	event_name	nesting_event_type
-user2	stage/sql/init	STATEMENT
-user2	stage/sql/checking permissions	STATEMENT
-user2	stage/sql/checking permissions	STATEMENT
-user2	stage/sql/init	STATEMENT
+user2	stage/sql/Init	STATEMENT
+user2	stage/sql/Checking permissions	STATEMENT
+user2	stage/sql/Init for update	STATEMENT
 user2	stage/sql/Opening tables	STATEMENT
 user2	stage/sql/After opening tables	STATEMENT
-user2	stage/sql/setup	STATEMENT
-user2	stage/sql/creating table	STATEMENT
+user2	stage/sql/Setup	STATEMENT
+user2	stage/sql/Creating table	STATEMENT
 user2	stage/sql/After create	STATEMENT
 connection con1;
 commit;
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
index 382824458a0..294c3a72f58 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 select * from performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
index 6fae8be810f..6ed2234babe 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 select * from performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
index ff9c6f93268..f942f2ee570 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 select * from performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
index 38e1f59cd39..fb02ace2ed4 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 select * from performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result
index a270b4a6320..cf210c0935c 100644
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result
index 05d67d88a8b..c02b75e5c33 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_account.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_account.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	0
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_accounts_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
index 574c8d4173b..a3e16b4be8d 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	0
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_cond_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
index ea5c7a69125..df5373ead87 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	0
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_cond_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result
index 0f93054bfd4..5e6da344a70 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	0
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_file_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
index 71004d68f5e..33dce305ef3 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	0
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_file_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result
index 329f74a4fff..a4f362b256f 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_host.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_host.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	0
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_hosts_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
index cda2719cc37..9fadcc581c7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	0
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_mutex_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
index 0ea5fe44521..c443a4e58db 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	0
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_mutex_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
index 29a17e6a3ac..c3939ced060 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	0
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_rwlock_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
index 8b214077f37..7892c6ba753 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	0
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_rwlock_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
index 3a0588d616d..24b0ee16685 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	0
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_setup_actors_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
index 89763379b99..630284c69be 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	0
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_setup_objects_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
index 0b14c6caf15..45e353a1372 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	0
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_socket_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
index 599e09f6c99..0c78ec66db9 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	0
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_socket_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
index 1d53efc500c..f3e95c3ac7b 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	0
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_stage_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
index 370ec61ff67..2e5005323dd 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	0
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_events_stages_history_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
index d8018e0ba44..cb29a5812fc 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	0
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_events_stages_history_long_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
index a617e7edb0a..d62b4ba1daa 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_statement_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
index 8d196aa9a4a..ed4b2870e6d 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	0
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_events_statements_history_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
index 360e8db910b..a48d5fa9339 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	0
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_events_statements_history_long_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
index 01b7233582e..5bc38231122 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	0
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_table_instances";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
index 5608c324321..def59b8b54b 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	0
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_table_instances";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
index b1a7758a9d8..16952409b56 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	0
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_thread_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
index ad0353589ad..e3ccd3f91e6 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	0
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_max_thread_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result
index 2e1c097e28b..7f006d6b47a 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_user.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_user.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	0
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_users_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
index a3a9cbeee11..27122723030 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	0
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_events_waits_history_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
index e5465aa6bbb..16ee8a30343 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	0
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema_events_waits_history_long_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result
index d28eed31e7d..2aa5658f98c 100644
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	0
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	0
-performance_schema_events_stages_history_size	0
-performance_schema_events_statements_history_long_size	0
-performance_schema_events_statements_history_size	0
-performance_schema_events_waits_history_long_size	0
-performance_schema_events_waits_history_size	0
-performance_schema_hosts_size	0
-performance_schema_max_cond_classes	0
-performance_schema_max_cond_instances	0
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	0
-performance_schema_max_file_handles	0
-performance_schema_max_file_instances	0
-performance_schema_max_mutex_classes	0
-performance_schema_max_mutex_instances	0
-performance_schema_max_rwlock_classes	0
-performance_schema_max_rwlock_instances	0
-performance_schema_max_socket_classes	0
-performance_schema_max_socket_instances	0
-performance_schema_max_stage_classes	0
-performance_schema_max_table_handles	0
-performance_schema_max_table_instances	0
-performance_schema_max_thread_classes	0
-performance_schema_max_thread_instances	0
-performance_schema_session_connect_attrs_size	0
-performance_schema_setup_actors_size	0
-performance_schema_setup_objects_size	0
-performance_schema_users_size	0
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show variables like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result
index 5666b96be8e..8c8b8a3a7bb 100644
--- a/mysql-test/suite/perfschema/r/start_server_off.result
+++ b/mysql-test/suite/perfschema/r/start_server_off.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 0
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	OFF
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show status like "performance_schema%";
@@ -131,6 +44,9 @@ Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
+show variables like "performance_schema";
+Variable_name	Value
+performance_schema	OFF
 select * from performance_schema.setup_consumers;
 NAME	ENABLED
 select * from performance_schema.setup_instruments;
diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result
index a270b4a6320..cf210c0935c 100644
--- a/mysql-test/suite/perfschema/r/start_server_on.result
+++ b/mysql-test/suite/perfschema/r/start_server_on.result
@@ -17,93 +17,6 @@ count(*) > 3
 select count(*) from performance_schema.setup_timers;
 count(*)
 4
-select * from performance_schema.accounts;
-select * from performance_schema.cond_instances;
-select * from performance_schema.events_stages_current;
-select * from performance_schema.events_stages_history;
-select * from performance_schema.events_stages_history_long;
-select * from performance_schema.events_stages_summary_by_account_by_event_name;
-select * from performance_schema.events_stages_summary_by_host_by_event_name;
-select * from performance_schema.events_stages_summary_by_thread_by_event_name;
-select * from performance_schema.events_stages_summary_by_user_by_event_name;
-select * from performance_schema.events_stages_summary_global_by_event_name;
-select * from performance_schema.events_statements_current;
-select * from performance_schema.events_statements_history;
-select * from performance_schema.events_statements_history_long;
-select * from performance_schema.events_statements_summary_by_account_by_event_name;
-select * from performance_schema.events_statements_summary_by_digest;
-select * from performance_schema.events_statements_summary_by_host_by_event_name;
-select * from performance_schema.events_statements_summary_by_thread_by_event_name;
-select * from performance_schema.events_statements_summary_by_user_by_event_name;
-select * from performance_schema.events_statements_summary_global_by_event_name;
-select * from performance_schema.events_waits_current;
-select * from performance_schema.events_waits_history;
-select * from performance_schema.events_waits_history_long;
-select * from performance_schema.events_waits_summary_by_account_by_event_name;
-select * from performance_schema.events_waits_summary_by_host_by_event_name;
-select * from performance_schema.events_waits_summary_by_instance;
-select * from performance_schema.events_waits_summary_by_thread_by_event_name;
-select * from performance_schema.events_waits_summary_by_user_by_event_name;
-select * from performance_schema.events_waits_summary_global_by_event_name;
-select * from performance_schema.file_instances;
-select * from performance_schema.file_summary_by_event_name;
-select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.host_cache;
-select * from performance_schema.hosts;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.objects_summary_global_by_type;
-select * from performance_schema.performance_timers;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-select * from performance_schema.setup_actors;
-select * from performance_schema.setup_consumers;
-select * from performance_schema.setup_instruments;
-select * from performance_schema.setup_objects;
-select * from performance_schema.setup_timers;
-select * from performance_schema.socket_instances;
-select * from performance_schema.socket_summary_by_instance;
-select * from performance_schema.socket_summary_by_event_name;
-select * from performance_schema.table_io_waits_summary_by_index_usage;
-select * from performance_schema.table_io_waits_summary_by_table;
-select * from performance_schema.table_lock_waits_summary_by_table;
-select * from performance_schema.threads;
-select * from performance_schema.users;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
 show status like "performance_schema%";
 show status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_variables.result b/mysql-test/suite/perfschema/r/start_server_variables.result
new file mode 100644
index 00000000000..3f2df9603b3
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_variables.result
@@ -0,0 +1,56 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+12
+select count(*) > 3 from performance_schema.setup_instruments;
+count(*) > 3
+1
+select count(*) from performance_schema.setup_timers;
+count(*)
+4
+show engine PERFORMANCE_SCHEMA status;
+show status like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
+Variable_name	Value
+performance_schema	ON
+performance_schema_accounts_size	100
+performance_schema_digests_size	200
+performance_schema_events_stages_history_long_size	1000
+performance_schema_events_stages_history_size	10
+performance_schema_events_statements_history_long_size	1000
+performance_schema_events_statements_history_size	10
+performance_schema_events_waits_history_long_size	10000
+performance_schema_events_waits_history_size	10
+performance_schema_hosts_size	100
+performance_schema_max_cond_classes	80
+performance_schema_max_cond_instances	1000
+performance_schema_max_digest_length	1024
+performance_schema_max_file_classes	50
+performance_schema_max_file_handles	32768
+performance_schema_max_file_instances	10000
+performance_schema_max_mutex_classes	200
+performance_schema_max_mutex_instances	5000
+performance_schema_max_rwlock_classes	40
+performance_schema_max_rwlock_instances	5000
+performance_schema_max_socket_classes	10
+performance_schema_max_socket_instances	1000
+performance_schema_max_stage_classes	160
+performance_schema_max_table_handles	1000
+performance_schema_max_table_instances	500
+performance_schema_max_thread_classes	50
+performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
+performance_schema_setup_actors_size	100
+performance_schema_setup_objects_size	100
+performance_schema_users_size	100
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
index 73a4696070d..dfaa91a3fbc 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
index bb7cfdc92c7..2a6537fd6bd 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
index 816df3de09a..3eddd735aa2 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
index d44488d75f9..fed189a7667 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
index a70e6ee1df5..ee95e4c0417 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
@@ -37,66 +37,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
index d4d19f5db05..d6e4e674258 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
@@ -36,66 +36,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
index 7fa8781ad49..2d2a55efa77 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
@@ -37,66 +37,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
index e138ad6542a..de8fc4702a6 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
@@ -36,66 +36,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result
index 9384f07f0f0..77a714563fe 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
index 42785a22c32..c176679a95d 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
index 1066228199d..38c8813ea18 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
index 4e36b9d75a6..9144d81c8a0 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
index ee32194b651..10736990dbe 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
index 2d3d2d38079..a8fd0a7eb72 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
index b47bf2dbe1e..701a25194f4 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
index 92c12d84f0f..4d8d625ee00 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
index 9b78d257e0e..8a8de99fd4f 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
index c5481451fd3..987732538c4 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
index 81f424800d6..324c6534303 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
index 15e62be4b22..914bcc7084b 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
index dbcf7aca9a4..f92ebe8e467 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
index 1230f1e91fe..8eb52d58efc 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
index 1b04e9fe898..fba8a48ad35 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
index f376160939d..2bcabb81def 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
index aae2c54e25c..323570b7d40 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
index 23f800e81d9..3a3d093d91e 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
index 99734474536..04c4fe4d949 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
index fe63232cf52..61783e41b1b 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
index 376333fc794..2be8dbdf5b3 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
index 191bd161d92..0ded9d54590 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
index 80590d5e468..13642f45b5a 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
index e9b39c5db14..61c649bd2cf 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
@@ -39,66 +39,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
index 92a020f1984..5d5282ba899 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
@@ -38,66 +38,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
index 4cdcbc45d7d..8da7fca1d3e 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
index 038335c22cb..88f658778c4 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
index ac5cde25522..72bc52cefa3 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
@@ -41,66 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
index faaf925dacd..d2ee0bd6c5e 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
@@ -40,66 +40,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	200
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1000
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_stage_classes	150
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	200
-performance_schema_session_connect_attrs_size	2048
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 "================== Step 1 =================="
 call dump_thread();
 username	status
diff --git a/mysql-test/suite/perfschema/t/start_server_off.test b/mysql-test/suite/perfschema/t/start_server_off.test
index 8b58f8c0814..400303e05d2 100644
--- a/mysql-test/suite/perfschema/t/start_server_off.test
+++ b/mysql-test/suite/perfschema/t/start_server_off.test
@@ -7,6 +7,7 @@
 
 # Expecting all off / zero
 show status like "performance_schema%";
+show variables like "performance_schema";
 
 # Expect all consumers disabled
 
@@ -44,5 +45,3 @@ truncate performance_schema.events_statements_history_long;
 truncate performance_schema.events_waits_history_long;
 truncate performance_schema.setup_objects;
 truncate performance_schema.setup_actors;
-
-
diff --git a/mysql-test/suite/perfschema/t/start_server_variables.test b/mysql-test/suite/perfschema/t/start_server_variables.test
new file mode 100644
index 00000000000..57656f9e077
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_variables.test
@@ -0,0 +1,11 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+# This has a stable output, printing the result:
+show variables where
+    `Variable_name` != "performance_schema_max_statement_classes" and
+    `Variable_name` like "performance_schema%";
diff --git a/mysql-test/suite/perfschema_stress/t/read.test b/mysql-test/suite/perfschema_stress/t/read.test
index c330444f600..829c03985ed 100644
--- a/mysql-test/suite/perfschema_stress/t/read.test
+++ b/mysql-test/suite/perfschema_stress/t/read.test
@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/have_perfschema.inc
 
 SELECT * FROM performance_schema.setup_instruments
 WHERE ENABLED='NO' AND TIMED='NO';
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 0919f9ec6ee..4b8fc41ca14 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2854,9 +2854,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES
 SESSION_VALUE	NULL
-GLOBAL_VALUE	150
+GLOBAL_VALUE	160
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	150
+DEFAULT_VALUE	160
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Maximum number of stage instruments.
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 11e4b6a088b..fd3a852f602 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -3050,9 +3050,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES
 SESSION_VALUE	NULL
-GLOBAL_VALUE	150
+GLOBAL_VALUE	160
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	150
+DEFAULT_VALUE	160
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Maximum number of stage instruments.
-- 
cgit v1.2.1