diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 551bc316469c9..1f9850191d951 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1420,7 +1420,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 160
 performance-schema-max-statement-classes 191
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1
diff --git a/mysql-test/r/show_explain_ps.result b/mysql-test/r/show_explain_ps.result
index 71c8f117fa2cc..fae432e830eea 100644
--- a/mysql-test/r/show_explain_ps.result
+++ b/mysql-test/r/show_explain_ps.result
@@ -4,7 +4,7 @@ drop table if exists t0, t1;
 select * from performance_schema.setup_instruments where name like '%show_explain%';
 NAME	ENABLED	TIMED
 wait/synch/cond/sql/show_explain	YES	YES
-stage/sql/show explain	YES	YES
+stage/sql/Show explain	YES	YES
 statement/sql/show_explain	YES	YES
 # We've got no instances
 select * from performance_schema.cond_instances where name like '%show_explain%';
@@ -38,5 +38,5 @@ thread_id in(select thread_id
 from performance_schema.events_statements_history_long
 where EVENT_NAME='statement/sql/show_explain');
 event_name
-stage/sql/show explain
+stage/sql/Show explain
 drop table t0;
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 748a0bee9272e..5dd432714abe5 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 b2da206debb37..6ade94dbe5893 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 59b20220d0818..ad109501f98fb 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 cd59b03c07d63..169053cb6be83 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 61576a3931634..5d3415331617d 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 c08483b63ada5..3606075e7a80b 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 7dfefd2523559..f116b09ff0473 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 41dcfd8ecb522..8cbd40c2bc144 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 ae548d116270d..80c622d77be46 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 1f168cee431a7..9ab62329fc9f3 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 7c9c3794d5f2e..ece0402335d91 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 c8a9233e2a649..083e1bffdd256 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 95b46de4b5771..c9b2b768691ae 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 2dda100704ffb..89443515f31cd 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 86edcf225c7ff..0ea5d90ea41af 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 f5c4044f40fba..52c674024bdb0 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 5b40823e6ff3d..a493631d71fae 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 e08aec948454c..78126d93cc7e0 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 bb57223748335..80897c221489a 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 b1bc1857b527a..5443c178502b2 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 b0570d7060291..f31bb1a8b7a46 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 1ca202e821f57..07fbf35619be8 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 b633d5fce8db6..1cf84a14d22b0 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 a698f55aa0787..4569ebd7a5e8e 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 2eda017467ab6..24fba02d16bc1 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 b4ca7b1b9be01..e49a9824f4241 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 eb72fa338aa90..5f55dd6c28eac 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 f82874bef74eb..7d15b250bd92c 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 8f7e70bc7406f..6362f725b882b 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 f7d519bedeb8c..c703e91089124 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 382824458a034..294c3a72f5884 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 6fae8be810f6f..6ed2234babea0 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 ff9c6f93268cd..f942f2ee57005 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 38e1f59cd39cf..fb02ace2ed4a2 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 a270b4a632034..cf210c0935c34 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 05d67d88a8b0d..c02b75e5c3334 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 574c8d4173b58..a3e16b4be8dba 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 ea5c7a6912570..df5373ead876b 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 0f93054bfd4ad..5e6da344a70e0 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 71004d68f5e88..33dce305ef3f6 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 329f74a4fffc3..a4f362b256fae 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 cda2719cc37ca..9fadcc581c703 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 0ea5fe445216b..c443a4e58db0e 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 29a17e6a3ac4c..c3939ced060cb 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 8b214077f3716..7892c6ba75311 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 3a0588d616de2..24b0ee16685e5 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 89763379b99ed..630284c69be19 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 0b14c6caf1547..45e353a1372ff 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 599e09f6c99a7..0c78ec66db9c7 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 1d53efc500cdd..f3e95c3ac7b75 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 370ec61ff6704..2e5005323dddc 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 d8018e0ba44b2..cb29a5812fc18 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 a617e7edb0a4d..d62b4ba1daa1c 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 8d196aa9a4a1a..ed4b2870e6d1f 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 360e8db910bf3..a48d5fa9339a5 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 01b7233582e35..5bc3823112218 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 5608c324321fa..def59b8b54b96 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 b1a7758a9d891..16952409b5611 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 ad0353589ad40..e3ccd3f91e61d 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 2e1c097e28b0c..7f006d6b47a92 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 a3a9cbeee11b0..2712272303090 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 e5465aa6bbbb6..16ee8a3034303 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 d28eed31e7d49..2aa5658f98cb5 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 5666b96be8e85..8c8b8a3a7bb55 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 a270b4a632034..cf210c0935c34 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 0000000000000..3f2df9603b3a2
--- /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 73a4696070d59..dfaa91a3fbc32 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 bb7cfdc92c718..2a6537fd6bdc7 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 816df3de09ab4..3eddd735aa278 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 d44488d75f92b..fed189a7667f1 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 a70e6ee1df599..ee95e4c0417f0 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 d4d19f5db05f3..d6e4e674258ca 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 7fa8781ad4977..2d2a55efa7737 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 e138ad6542a32..de8fc4702a6bd 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 9384f07f0f07d..77a714563fec8 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 42785a22c3273..c176679a95d61 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 1066228199dbb..38c8813ea184b 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 4e36b9d75a6d3..9144d81c8a02c 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 ee32194b6513f..10736990dbe35 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 2d3d2d38079d1..a8fd0a7eb7271 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 b47bf2dbe1e7e..701a25194f499 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 92c12d84f0fca..4d8d625ee0045 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 9b78d257e0e18..8a8de99fd4f79 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 c5481451fd39a..987732538c41a 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 81f424800d60d..324c653430319 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 15e62be4b22c1..914bcc7084b0a 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 dbcf7aca9a417..f92ebe8e4678e 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 1230f1e91fe2b..8eb52d58efcf0 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 1b04e9fe89813..fba8a48ad35fd 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 f376160939d2b..2bcabb81deff5 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 aae2c54e25c5b..323570b7d40b6 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 23f800e81d903..3a3d093d91e6e 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 99734474536f8..04c4fe4d949f8 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 fe63232cf522e..61783e41b1b6d 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 376333fc79439..2be8dbdf5b352 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 191bd161d9249..0ded9d54590ab 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 80590d5e4681d..13642f45b5a1e 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 e9b39c5db14f8..61c649bd2cf1a 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 92a020f198423..5d5282ba899b0 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 4cdcbc45d7d36..8da7fca1d3eeb 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 038335c22cb87..88f658778c4e9 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 ac5cde2552290..72bc52cefa34d 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 faaf925dacd4d..d2ee0bd6c5ee6 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 8b58f8c081435..400303e05d294 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 0000000000000..57656f9e0777c
--- /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 c330444f600d7..829c03985edc4 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 0919f9ec6ee18..4b8fc41ca14b4 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 11e4b6a088bdb..fd3a852f6025e 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.
diff --git a/sql/lock.cc b/sql/lock.cc
index 83a0896808f8f..c6dd3724eba0d 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -421,8 +421,11 @@ void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock)
 
 void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock)
 {
-  DBUG_ENTER("mysql_unlock_tables");
   bool errors= thd->is_error();
+  PSI_stage_info org_stage;
+  DBUG_ENTER("mysql_unlock_tables");
+
+  thd->backup_stage(&org_stage);
   THD_STAGE_INFO(thd, stage_unlocking_tables);
 
   if (sql_lock->table_count)
@@ -433,6 +436,7 @@ void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock, bool free_lock)
     my_free(sql_lock);
   if (!errors)
     thd->clear_error();
+  THD_STAGE_INFO(thd, org_stage);
   DBUG_VOID_RETURN;
 }
 
diff --git a/sql/log.cc b/sql/log.cc
index 02d83a89bef44..540b7a256cecc 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2002,7 +2002,9 @@ static bool trans_cannot_safely_rollback(THD *thd, bool all)
 static int binlog_commit(handlerton *hton, THD *thd, bool all)
 {
   int error= 0;
+  PSI_stage_info org_stage;
   DBUG_ENTER("binlog_commit");
+
   binlog_cache_mngr *const cache_mngr=
     (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
 
@@ -2019,6 +2021,9 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all)
               YESNO(thd->transaction.all.modified_non_trans_table),
               YESNO(thd->transaction.stmt.modified_non_trans_table)));
 
+
+  thd->backup_stage(&org_stage);
+  THD_STAGE_INFO(thd, stage_binlog_write);
   if (!cache_mngr->stmt_cache.empty())
   {
     error= binlog_commit_flush_stmt_cache(thd, all, cache_mngr);
@@ -2030,6 +2035,7 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all)
       we're here because cache_log was flushed in MYSQL_BIN_LOG::log_xid()
     */
     cache_mngr->reset(false, true);
+    THD_STAGE_INFO(thd, org_stage);
     DBUG_RETURN(error);
   }
 
@@ -2048,6 +2054,7 @@ static int binlog_commit(handlerton *hton, THD *thd, bool all)
   if (!all)
     cache_mngr->trx_cache.set_prev_position(MY_OFF_T_UNDEF);
 
+  THD_STAGE_INFO(thd, org_stage);
   DBUG_RETURN(error);
 }
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index cc94a7e7c79dd..c91529efb92d0 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -10100,104 +10100,110 @@ static PSI_file_info all_server_files[]=
 };
 #endif /* HAVE_PSI_INTERFACE */
 
-PSI_stage_info stage_after_apply_event= { 0, "after apply log event", 0};
+PSI_stage_info stage_after_apply_event= { 0, "After apply log event", 0};
 PSI_stage_info stage_after_create= { 0, "After create", 0};
 PSI_stage_info stage_after_opening_tables= { 0, "After opening tables", 0};
 PSI_stage_info stage_after_table_lock= { 0, "After table lock", 0};
-PSI_stage_info stage_allocating_local_table= { 0, "allocating local table", 0};
-PSI_stage_info stage_alter_inplace_prepare= { 0, "preparing for alter table", 0};
-PSI_stage_info stage_alter_inplace= { 0, "altering table", 0};
-PSI_stage_info stage_alter_inplace_commit= { 0, "committing alter table to storage engine", 0};
-PSI_stage_info stage_apply_event= { 0, "apply log event", 0};
+PSI_stage_info stage_allocating_local_table= { 0, "Allocating local table", 0};
+PSI_stage_info stage_alter_inplace_prepare= { 0, "Preparing for alter table", 0};
+PSI_stage_info stage_alter_inplace= { 0, "Altering table", 0};
+PSI_stage_info stage_alter_inplace_commit= { 0, "Committing alter table to storage engine", 0};
+PSI_stage_info stage_apply_event= { 0, "Apply log event", 0};
 PSI_stage_info stage_changing_master= { 0, "Changing master", 0};
 PSI_stage_info stage_checking_master_version= { 0, "Checking master version", 0};
-PSI_stage_info stage_checking_permissions= { 0, "checking permissions", 0};
-PSI_stage_info stage_checking_privileges_on_cached_query= { 0, "checking privileges on cached query", 0};
-PSI_stage_info stage_checking_query_cache_for_query= { 0, "checking query cache for query", 0};
-PSI_stage_info stage_cleaning_up= { 0, "cleaning up", 0};
-PSI_stage_info stage_closing_tables= { 0, "closing tables", 0};
+PSI_stage_info stage_checking_permissions= { 0, "Checking permissions", 0};
+PSI_stage_info stage_checking_privileges_on_cached_query= { 0, "Checking privileges on cached query", 0};
+PSI_stage_info stage_checking_query_cache_for_query= { 0, "Checking query cache for query", 0};
+PSI_stage_info stage_cleaning_up= { 0, "Reset for next command", 0};
+PSI_stage_info stage_closing_tables= { 0, "Closing tables", 0};
 PSI_stage_info stage_connecting_to_master= { 0, "Connecting to master", 0};
-PSI_stage_info stage_converting_heap_to_myisam= { 0, "converting HEAP to " TMP_ENGINE_NAME, 0};
+PSI_stage_info stage_converting_heap_to_myisam= { 0, "Converting HEAP to " TMP_ENGINE_NAME, 0};
 PSI_stage_info stage_copying_to_group_table= { 0, "Copying to group table", 0};
 PSI_stage_info stage_copying_to_tmp_table= { 0, "Copying to tmp table", 0};
-PSI_stage_info stage_copy_to_tmp_table= { 0, "copy to tmp table", 0};
+PSI_stage_info stage_copy_to_tmp_table= { 0, "Copy to tmp table", 0};
 PSI_stage_info stage_creating_delayed_handler= { 0, "Creating delayed handler", 0};
 PSI_stage_info stage_creating_sort_index= { 0, "Creating sort index", 0};
-PSI_stage_info stage_creating_table= { 0, "creating table", 0};
+PSI_stage_info stage_creating_table= { 0, "Creating table", 0};
 PSI_stage_info stage_creating_tmp_table= { 0, "Creating tmp table", 0};
-PSI_stage_info stage_deleting_from_main_table= { 0, "deleting from main table", 0};
-PSI_stage_info stage_deleting_from_reference_tables= { 0, "deleting from reference tables", 0};
-PSI_stage_info stage_discard_or_import_tablespace= { 0, "discard_or_import_tablespace", 0};
-PSI_stage_info stage_enabling_keys= { 0, "enabling keys", 0};
-PSI_stage_info stage_end= { 0, "end", 0};
-PSI_stage_info stage_executing= { 0, "executing", 0};
+PSI_stage_info stage_deleting_from_main_table= { 0, "Deleting from main table", 0};
+PSI_stage_info stage_deleting_from_reference_tables= { 0, "Deleting from reference tables", 0};
+PSI_stage_info stage_discard_or_import_tablespace= { 0, "Discard_or_import_tablespace", 0};
+PSI_stage_info stage_enabling_keys= { 0, "Enabling keys", 0};
+PSI_stage_info stage_end= { 0, "End of update loop", 0};
+PSI_stage_info stage_executing= { 0, "Executing", 0};
 PSI_stage_info stage_execution_of_init_command= { 0, "Execution of init_command", 0};
-PSI_stage_info stage_explaining= { 0, "explaining", 0};
+PSI_stage_info stage_explaining= { 0, "Explaining", 0};
 PSI_stage_info stage_finding_key_cache= { 0, "Finding key cache", 0};
 PSI_stage_info stage_finished_reading_one_binlog_switching_to_next_binlog= { 0, "Finished reading one binlog; switching to next binlog", 0};
 PSI_stage_info stage_flushing_relay_log_and_master_info_repository= { 0, "Flushing relay log and master info repository.", 0};
 PSI_stage_info stage_flushing_relay_log_info_file= { 0, "Flushing relay-log info file.", 0};
-PSI_stage_info stage_freeing_items= { 0, "freeing items", 0};
-PSI_stage_info stage_fulltext_initialization= { 0, "FULLTEXT initialization", 0};
-PSI_stage_info stage_got_handler_lock= { 0, "got handler lock", 0};
-PSI_stage_info stage_got_old_table= { 0, "got old table", 0};
-PSI_stage_info stage_init= { 0, "init", 0};
-PSI_stage_info stage_insert= { 0, "insert", 0};
-PSI_stage_info stage_invalidating_query_cache_entries_table= { 0, "invalidating query cache entries (table)", 0};
-PSI_stage_info stage_invalidating_query_cache_entries_table_list= { 0, "invalidating query cache entries (table list)", 0};
+PSI_stage_info stage_freeing_items= { 0, "Freeing items", 0};
+PSI_stage_info stage_fulltext_initialization= { 0, "Fulltext initialization", 0};
+PSI_stage_info stage_got_handler_lock= { 0, "Got handler lock", 0};
+PSI_stage_info stage_got_old_table= { 0, "Got old table", 0};
+PSI_stage_info stage_init= { 0, "Init", 0};
+PSI_stage_info stage_init_update= { 0, "Init for update", 0};
+PSI_stage_info stage_insert= { 0, "Insert", 0};
+PSI_stage_info stage_invalidating_query_cache_entries_table= { 0, "Invalidating query cache entries (table)", 0};
+PSI_stage_info stage_invalidating_query_cache_entries_table_list= { 0, "Invalidating query cache entries (table list)", 0};
 PSI_stage_info stage_killing_slave= { 0, "Killing slave", 0};
-PSI_stage_info stage_logging_slow_query= { 0, "logging slow query", 0};
+PSI_stage_info stage_logging_slow_query= { 0, "Logging slow query", 0};
 PSI_stage_info stage_making_temp_file_append_before_load_data= { 0, "Making temporary file (append) before replaying LOAD DATA INFILE.", 0};
 PSI_stage_info stage_making_temp_file_create_before_load_data= { 0, "Making temporary file (create) before replaying LOAD DATA INFILE.", 0};
-PSI_stage_info stage_manage_keys= { 0, "manage keys", 0};
+PSI_stage_info stage_manage_keys= { 0, "Manage keys", 0};
 PSI_stage_info stage_master_has_sent_all_binlog_to_slave= { 0, "Master has sent all binlog to slave; waiting for binlog to be updated", 0};
 PSI_stage_info stage_opening_tables= { 0, "Opening tables", 0};
-PSI_stage_info stage_optimizing= { 0, "optimizing", 0};
-PSI_stage_info stage_preparing= { 0, "preparing", 0};
+PSI_stage_info stage_optimizing= { 0, "Optimizing", 0};
+PSI_stage_info stage_preparing= { 0, "Preparing", 0};
 PSI_stage_info stage_purging_old_relay_logs= { 0, "Purging old relay logs", 0};
-PSI_stage_info stage_query_end= { 0, "query end", 0};
+PSI_stage_info stage_query_end= { 0, "Query end", 0};
+PSI_stage_info stage_starting_cleanup= { 0, "Starting cleanup", 0};
+PSI_stage_info stage_rollback= { 0, "Rollback", 0};
+PSI_stage_info stage_rollback_implicit= { 0, "Rollback_implicit", 0};
+PSI_stage_info stage_commit= { 0, "Commit", 0};
+PSI_stage_info stage_commit_implicit= { 0, "Commit_implicit", 0};
 PSI_stage_info stage_queueing_master_event_to_the_relay_log= { 0, "Queueing master event to the relay log", 0};
 PSI_stage_info stage_reading_event_from_the_relay_log= { 0, "Reading event from the relay log", 0};
-PSI_stage_info stage_recreating_table= { 0, "recreating table", 0};
+PSI_stage_info stage_recreating_table= { 0, "Recreating table", 0};
 PSI_stage_info stage_registering_slave_on_master= { 0, "Registering slave on master", 0};
 PSI_stage_info stage_removing_duplicates= { 0, "Removing duplicates", 0};
-PSI_stage_info stage_removing_tmp_table= { 0, "removing tmp table", 0};
-PSI_stage_info stage_rename= { 0, "rename", 0};
-PSI_stage_info stage_rename_result_table= { 0, "rename result table", 0};
+PSI_stage_info stage_removing_tmp_table= { 0, "Removing tmp table", 0};
+PSI_stage_info stage_rename= { 0, "Rename", 0};
+PSI_stage_info stage_rename_result_table= { 0, "Rename result table", 0};
 PSI_stage_info stage_requesting_binlog_dump= { 0, "Requesting binlog dump", 0};
-PSI_stage_info stage_reschedule= { 0, "reschedule", 0};
+PSI_stage_info stage_reschedule= { 0, "Reschedule", 0};
 PSI_stage_info stage_searching_rows_for_update= { 0, "Searching rows for update", 0};
 PSI_stage_info stage_sending_binlog_event_to_slave= { 0, "Sending binlog event to slave", 0};
-PSI_stage_info stage_sending_cached_result_to_client= { 0, "sending cached result to client", 0};
+PSI_stage_info stage_sending_cached_result_to_client= { 0, "Sending cached result to client", 0};
 PSI_stage_info stage_sending_data= { 0, "Sending data", 0};
-PSI_stage_info stage_setup= { 0, "setup", 0};
-PSI_stage_info stage_show_explain= { 0, "show explain", 0};
+PSI_stage_info stage_setup= { 0, "Setup", 0};
+PSI_stage_info stage_show_explain= { 0, "Show explain", 0};
 PSI_stage_info stage_slave_has_read_all_relay_log= { 0, "Slave has read all relay log; waiting for the slave I/O thread to update it", 0};
 PSI_stage_info stage_sorting= { 0, "Sorting", 0};
 PSI_stage_info stage_sorting_for_group= { 0, "Sorting for group", 0};
 PSI_stage_info stage_sorting_for_order= { 0, "Sorting for order", 0};
 PSI_stage_info stage_sorting_result= { 0, "Sorting result", 0};
-PSI_stage_info stage_statistics= { 0, "statistics", 0};
+PSI_stage_info stage_statistics= { 0, "Statistics", 0};
 PSI_stage_info stage_sql_thd_waiting_until_delay= { 0, "Waiting until MASTER_DELAY seconds after master executed event", 0 };
-PSI_stage_info stage_storing_result_in_query_cache= { 0, "storing result in query cache", 0};
-PSI_stage_info stage_storing_row_into_queue= { 0, "storing row into queue", 0};
+PSI_stage_info stage_storing_result_in_query_cache= { 0, "Storing result in query cache", 0};
+PSI_stage_info stage_storing_row_into_queue= { 0, "Storing row into queue", 0};
 PSI_stage_info stage_system_lock= { 0, "System lock", 0};
 PSI_stage_info stage_unlocking_tables= { 0, "Unlocking tables", 0};
 PSI_stage_info stage_table_lock= { 0, "Table lock", 0};
 PSI_stage_info stage_filling_schema_table= { 0, "Filling schema table", 0};
-PSI_stage_info stage_update= { 0, "update", 0};
-PSI_stage_info stage_updating= { 0, "updating", 0};
-PSI_stage_info stage_updating_main_table= { 0, "updating main table", 0};
-PSI_stage_info stage_updating_reference_tables= { 0, "updating reference tables", 0};
-PSI_stage_info stage_upgrading_lock= { 0, "upgrading lock", 0};
+PSI_stage_info stage_update= { 0, "Update", 0};
+PSI_stage_info stage_updating= { 0, "Updating", 0};
+PSI_stage_info stage_updating_main_table= { 0, "Updating main table", 0};
+PSI_stage_info stage_updating_reference_tables= { 0, "Updating reference tables", 0};
+PSI_stage_info stage_upgrading_lock= { 0, "Upgrading lock", 0};
 PSI_stage_info stage_user_lock= { 0, "User lock", 0};
 PSI_stage_info stage_user_sleep= { 0, "User sleep", 0};
-PSI_stage_info stage_verifying_table= { 0, "verifying table", 0};
-PSI_stage_info stage_waiting_for_delay_list= { 0, "waiting for delay_list", 0};
-PSI_stage_info stage_waiting_for_gtid_to_be_written_to_binary_log= { 0, "waiting for GTID to be written to binary log", 0};
-PSI_stage_info stage_waiting_for_handler_insert= { 0, "waiting for handler insert", 0};
-PSI_stage_info stage_waiting_for_handler_lock= { 0, "waiting for handler lock", 0};
-PSI_stage_info stage_waiting_for_handler_open= { 0, "waiting for handler open", 0};
+PSI_stage_info stage_verifying_table= { 0, "Verifying table", 0};
+PSI_stage_info stage_waiting_for_delay_list= { 0, "Waiting for delay_list", 0};
+PSI_stage_info stage_waiting_for_gtid_to_be_written_to_binary_log= { 0, "Waiting for GTID to be written to binary log", 0};
+PSI_stage_info stage_waiting_for_handler_insert= { 0, "Waiting for handler insert", 0};
+PSI_stage_info stage_waiting_for_handler_lock= { 0, "Waiting for handler lock", 0};
+PSI_stage_info stage_waiting_for_handler_open= { 0, "Waiting for handler open", 0};
 PSI_stage_info stage_waiting_for_insert= { 0, "Waiting for INSERT", 0};
 PSI_stage_info stage_waiting_for_master_to_send_event= { 0, "Waiting for master to send event", 0};
 PSI_stage_info stage_waiting_for_master_update= { 0, "Waiting for master update", 0};
@@ -10211,6 +10217,7 @@ PSI_stage_info stage_waiting_for_the_slave_thread_to_advance_position= { 0, "Wai
 PSI_stage_info stage_waiting_to_finalize_termination= { 0, "Waiting to finalize termination", 0};
 PSI_stage_info stage_waiting_to_get_readlock= { 0, "Waiting to get readlock", 0};
 PSI_stage_info stage_binlog_waiting_background_tasks= { 0, "Waiting for background binlog tasks", 0};
+PSI_stage_info stage_binlog_write= { 0, "Writing to binlog", 0};
 PSI_stage_info stage_binlog_processing_checkpoint_notify= { 0, "Processing binlog checkpoint notification", 0};
 PSI_stage_info stage_binlog_stopping_background_thread= { 0, "Stopping binlog background thread", 0};
 PSI_stage_info stage_waiting_for_work_from_sql_thread= { 0, "Waiting for work from SQL thread", 0};
@@ -10241,6 +10248,7 @@ PSI_stage_info *all_server_stages[]=
   & stage_alter_inplace_commit,
   & stage_alter_inplace_prepare,
   & stage_apply_event,
+  & stage_binlog_write,
   & stage_binlog_processing_checkpoint_notify,
   & stage_binlog_stopping_background_thread,
   & stage_binlog_waiting_background_tasks,
@@ -10251,6 +10259,8 @@ PSI_stage_info *all_server_stages[]=
   & stage_checking_query_cache_for_query,
   & stage_cleaning_up,
   & stage_closing_tables,
+  & stage_commit,
+  & stage_commit_implicit,
   & stage_connecting_to_master,
   & stage_converting_heap_to_myisam,
   & stage_copy_to_tmp_table,
@@ -10277,6 +10287,7 @@ PSI_stage_info *all_server_stages[]=
   & stage_got_handler_lock,
   & stage_got_old_table,
   & stage_init,
+  & stage_init_update,
   & stage_insert,
   & stage_invalidating_query_cache_entries_table,
   & stage_invalidating_query_cache_entries_table_list,
@@ -10290,6 +10301,7 @@ PSI_stage_info *all_server_stages[]=
   & stage_optimizing,
   & stage_preparing,
   & stage_purging_old_relay_logs,
+  & stage_starting_cleanup,
   & stage_query_end,
   & stage_queueing_master_event_to_the_relay_log,
   & stage_reading_event_from_the_relay_log,
@@ -10301,6 +10313,8 @@ PSI_stage_info *all_server_stages[]=
   & stage_rename_result_table,
   & stage_requesting_binlog_dump,
   & stage_reschedule,
+  & stage_rollback,
+  & stage_rollback_implicit,
   & stage_searching_rows_for_update,
   & stage_sending_binlog_event_to_slave,
   & stage_sending_cached_result_to_client,
diff --git a/sql/mysqld.h b/sql/mysqld.h
index aa08f77d468d0..ed6685828ba34 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -411,6 +411,7 @@ extern PSI_stage_info stage_fulltext_initialization;
 extern PSI_stage_info stage_got_handler_lock;
 extern PSI_stage_info stage_got_old_table;
 extern PSI_stage_info stage_init;
+extern PSI_stage_info stage_init_update;
 extern PSI_stage_info stage_insert;
 extern PSI_stage_info stage_invalidating_query_cache_entries_table;
 extern PSI_stage_info stage_invalidating_query_cache_entries_table_list;
@@ -425,6 +426,11 @@ extern PSI_stage_info stage_optimizing;
 extern PSI_stage_info stage_preparing;
 extern PSI_stage_info stage_purging_old_relay_logs;
 extern PSI_stage_info stage_query_end;
+extern PSI_stage_info stage_starting_cleanup;
+extern PSI_stage_info stage_rollback;
+extern PSI_stage_info stage_rollback_implicit;
+extern PSI_stage_info stage_commit;
+extern PSI_stage_info stage_commit_implicit;
 extern PSI_stage_info stage_queueing_master_event_to_the_relay_log;
 extern PSI_stage_info stage_reading_event_from_the_relay_log;
 extern PSI_stage_info stage_recreating_table;
@@ -480,6 +486,7 @@ extern PSI_stage_info stage_waiting_for_the_slave_thread_to_advance_position;
 extern PSI_stage_info stage_waiting_to_finalize_termination;
 extern PSI_stage_info stage_waiting_to_get_readlock;
 extern PSI_stage_info stage_binlog_waiting_background_tasks;
+extern PSI_stage_info stage_binlog_write;
 extern PSI_stage_info stage_binlog_processing_checkpoint_notify;
 extern PSI_stage_info stage_binlog_stopping_background_thread;
 extern PSI_stage_info stage_waiting_for_work_from_sql_thread;
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 73ce5403f3807..0649ea2a4a372 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -2002,7 +2002,6 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
       thd->get_stmt_da()->set_overwrite_status(false);
     }
 
-    thd_proc_info(thd, "closing tables");
     close_thread_tables(thd);
     thd_proc_info(thd, 0);
 
@@ -3107,7 +3106,6 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
       thd->is_error() ? trans_rollback_stmt(thd) : trans_commit_stmt(thd);
       thd->get_stmt_da()->set_overwrite_status(false);
     }
-    thd_proc_info(thd, "closing tables");
     close_thread_tables(thd);
     thd_proc_info(thd, 0);
 
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 9b1f755a02c84..e7a0168fb4837 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -273,6 +273,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
   if (open_and_lock_tables(thd, table_list, TRUE, 0))
     DBUG_RETURN(TRUE);
 
+  THD_STAGE_INFO(thd, stage_init_update);
   if (mysql_handle_list_of_derived(thd->lex, table_list, DT_MERGE_FOR_INSERT))
     DBUG_RETURN(TRUE);
   if (mysql_handle_list_of_derived(thd->lex, table_list, DT_PREPARE))
@@ -289,7 +290,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
 	       table_list->view_db.str, table_list->view_name.str);
     DBUG_RETURN(TRUE);
   }
-  THD_STAGE_INFO(thd, stage_init);
   table->map=1;
   query_plan.select_lex= &thd->lex->select_lex;
   query_plan.table= table;
@@ -556,7 +556,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
     goto got_error;
   
   init_ftfuncs(thd, select_lex, 1);
-  THD_STAGE_INFO(thd, stage_updating);
 
   if (table->prepare_triggers_for_delete_stmt_or_event())
   {
@@ -588,6 +587,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
     deltempfile= new (thd->mem_root) Unique (refpos_order_cmp, table->file,
                                              table->file->ref_length,
                                              MEM_STRIP_BUF_SIZE);
+
+    THD_STAGE_INFO(thd, stage_searching_rows_for_update);
     while (!(error=info.read_record(&info)) && !thd->killed &&
           ! thd->is_error())
     {
@@ -613,6 +614,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
     delete_record= true;
   }
 
+  THD_STAGE_INFO(thd, stage_updating);
   while (!(error=info.read_record(&info)) && !thd->killed &&
         ! thd->is_error())
   {
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 98e0da1ddbe0b..698ff8246edb7 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -761,9 +761,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
       DBUG_RETURN(TRUE);
   }
 
+  THD_STAGE_INFO(thd, stage_init_update);
   lock_type= table_list->lock_type;
-
-  THD_STAGE_INFO(thd, stage_init);
   thd->lex->used_tables=0;
   values= its++;
   if (bulk_parameters_set(thd))
@@ -860,7 +859,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
 #endif
 
   error=0;
-  THD_STAGE_INFO(thd, stage_update);
   if (duplic == DUP_REPLACE &&
       (!table->triggers || !table->triggers->has_delete_triggers()))
     table->file->extra(HA_EXTRA_WRITE_CAN_REPLACE);
@@ -940,6 +938,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
       goto values_loop_end;
     }
   }
+
+  THD_STAGE_INFO(thd, stage_update);
   do
   {
     DBUG_PRINT("info", ("iteration %llu", iteration));
@@ -3357,7 +3357,7 @@ bool Delayed_insert::handle_inserts(void)
   }
 
   if (WSREP((&thd)))
-    thd_proc_info(&thd, "insert done");
+    thd_proc_info(&thd, "Insert done");
   else
     thd_proc_info(&thd, 0);
   mysql_mutex_unlock(&mutex);
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 5e11794f139cd..6e3396f0fcfbb 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -348,7 +348,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   {
     DBUG_RETURN(TRUE);
   }
-  thd_proc_info(thd, "executing");
+  thd_proc_info(thd, "Executing");
   /*
     Let us emit an error if we are loading data to table which is used
     in subselect in SET clause like we do it for INSERT.
@@ -574,7 +574,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
     }
   }
 
-  thd_proc_info(thd, "reading file");
+  thd_proc_info(thd, "Reading file");
   if (!(error= MY_TEST(read_info.error)))
   {
     table->reset_default_fields();
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 738d59fd40137..0132921ad1ce6 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2370,7 +2370,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
                (thd->open_tables == NULL ||
                (thd->locked_tables_mode == LTM_LOCK_TABLES)));
 
-    thd_proc_info(thd, "updating status");
+    thd_proc_info(thd, "Updating status");
     /* Finalize server status flags after executing a command. */
     thd->update_server_status();
     if (command != COM_MULTI)
@@ -6245,10 +6245,14 @@ mysql_execute_command(THD *thd)
       thd->reset_kill_query();
     }
     if (thd->is_error() || (thd->variables.option_bits & OPTION_MASTER_SQL_ERROR))
+    {
+      THD_STAGE_INFO(thd, stage_rollback);
       trans_rollback_stmt(thd);
+    }
     else
     {
       /* If commit fails, we should be able to reset the OK status. */
+      THD_STAGE_INFO(thd, stage_commit);
       thd->get_stmt_da()->set_overwrite_status(true);
       trans_commit_stmt(thd);
       thd->get_stmt_da()->set_overwrite_status(false);
@@ -6258,12 +6262,13 @@ mysql_execute_command(THD *thd)
 #endif
   }
 
-  /* Free tables */
+  /* Free tables. Set stage 'closing tables' */
   close_thread_tables(thd);
 #ifdef WITH_WSREP
   thd->wsrep_consistency_check= NO_CONSISTENCY_CHECK;
 #endif /* WITH_WSREP */
 
+
 #ifndef DBUG_OFF
   if (lex->sql_command != SQLCOM_SET_OPTION && ! thd->in_sub_stmt)
     DEBUG_SYNC(thd, "execute_command_after_close_tables");
@@ -6281,6 +6286,7 @@ mysql_execute_command(THD *thd)
       one of storage engines (e.g. due to deadlock). Rollback transaction in
       all storage engines including binary log.
     */
+    THD_STAGE_INFO(thd, stage_rollback_implicit);
     trans_rollback_implicit(thd);
     thd->mdl_context.release_transactional_locks();
   }
@@ -6290,6 +6296,7 @@ mysql_execute_command(THD *thd)
     DBUG_ASSERT(! thd->in_sub_stmt);
     if (!(thd->variables.option_bits & OPTION_GTID_BEGIN))
     {
+      THD_STAGE_INFO(thd, stage_commit_implicit);
       /* If commit fails, we should be able to reset the OK status. */
       thd->get_stmt_da()->set_overwrite_status(true);
       /* Commit the normal transaction if one is active. */
@@ -6317,6 +6324,8 @@ mysql_execute_command(THD *thd)
     thd->mdl_context.release_statement_locks();
   }
 
+  THD_STAGE_INFO(thd, stage_starting_cleanup);
+
   TRANSACT_TRACKER(add_trx_state_from_thd(thd));
 
   WSREP_TO_ISOLATION_END;
@@ -6585,7 +6594,9 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
     dummy= 0;
   }
 
-  THD_STAGE_INFO(thd, stage_checking_permissions);
+  /* check access may be called twice in a row. Don't change to same stage */
+  if (thd->proc_info != stage_checking_permissions.m_name)
+    THD_STAGE_INFO(thd, stage_checking_permissions);
   if ((!db || !db[0]) && !thd->db && !dont_check_global_grants)
   {
     DBUG_PRINT("error",("No database"));
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index 61b026e545000..44dbd60887521 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.cc
@@ -595,7 +595,7 @@ bool Sql_cmd_alter_table_exchange_partition::
 
   /* Table and partition has same structure/options, OK to exchange */
 
-  thd_proc_info(thd, "verifying data with partition");
+  thd_proc_info(thd, "Verifying data with partition");
 
   if (verify_data_with_partition(swap_table, part_table, swap_part_id))
     DBUG_RETURN(TRUE);
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index 38682f3ddec13..c96828fc6787f 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -287,7 +287,7 @@ class PROFILING
 
     @param  initial_state  (optional) name of period before first state change
   */
-  void start_new_query(const char *initial_state= "starting")
+  void start_new_query(const char *initial_state= "Starting")
   {
     DBUG_ASSERT(!current);
     if (unlikely(enabled))
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index c9057849ed5e3..a10c9fc1b1b40 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -8591,7 +8591,7 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
 #endif
   }
 
-  THD_STAGE_INFO(thd, stage_init);
+  THD_STAGE_INFO(thd, stage_init_update);
 
   /*
     Code below can handle only base tables so ensure that we won't open a view.
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 9d69f8edcff0d..55be8723ab31e 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -305,12 +305,12 @@ int mysql_update(THD *thd,
   if (lock_tables(thd, table_list, table_count, 0))
     DBUG_RETURN(1);
 
+  THD_STAGE_INFO(thd, stage_init_update);
   if (table_list->handle_derived(thd->lex, DT_MERGE_FOR_INSERT))
     DBUG_RETURN(1);
   if (table_list->handle_derived(thd->lex, DT_PREPARE))
     DBUG_RETURN(1);
 
-  THD_STAGE_INFO(thd, stage_init);
   table= table_list->table;
 
   if (!table_list->single_table_updatable())
@@ -707,7 +707,6 @@ int mysql_update(THD *thd,
   */
   thd->count_cuted_fields= CHECK_FIELD_WARN;
   thd->cuted_fields=0L;
-  THD_STAGE_INFO(thd, stage_updating);
 
   transactional_table= table->file->has_transactions();
   thd->abort_on_warning= !ignore && thd->is_strict_mode();
@@ -735,6 +734,7 @@ int mysql_update(THD *thd,
   can_compare_record= records_are_comparable(table);
   explain->tracker.on_scan_init();
 
+  THD_STAGE_INFO(thd, stage_updating);
   while (!(error=info.read_record(&info)) && !thd->killed)
   {
     explain->tracker.on_record_read();
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 32fa481395ea8..e52ea0f7a399b 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -706,7 +706,6 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
   DBUG_RETURN(0);
 
 err:
-  THD_STAGE_INFO(thd, stage_end);
   lex->link_first_table_back(view, link_to_local);
   unit->cleanup();
   DBUG_RETURN(res || thd->is_error());
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc
index a299ddf074fc9..958add48b5a7b 100644
--- a/sql/wsrep_applier.cc
+++ b/sql/wsrep_applier.cc
@@ -234,11 +234,11 @@ wsrep_cb_status_t wsrep_apply_cb(void* const             ctx,
 
 #ifdef WSREP_PROC_INFO
   snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
-           "applying write set %lld: %p, %zu",
+           "Applying write set %lld: %p, %zu",
            (long long)wsrep_thd_trx_seqno(thd), buf, buf_len);
   thd_proc_info(thd, thd->wsrep_info);
 #else
-  thd_proc_info(thd, "applying write set");
+  thd_proc_info(thd, "Applying write set");
 #endif /* WSREP_PROC_INFO */
 
   /* tune FK and UK checking policy */
@@ -268,10 +268,10 @@ wsrep_cb_status_t wsrep_apply_cb(void* const             ctx,
 
 #ifdef WSREP_PROC_INFO
   snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
-           "applied write set %lld", (long long)wsrep_thd_trx_seqno(thd));
+           "Applied write set %lld", (long long)wsrep_thd_trx_seqno(thd));
   thd_proc_info(thd, thd->wsrep_info);
 #else
-  thd_proc_info(thd, "applied write set");
+  thd_proc_info(thd, "Applied write set");
 #endif /* WSREP_PROC_INFO */
 
   if (WSREP_CB_SUCCESS != rcode)
@@ -293,10 +293,10 @@ static wsrep_cb_status_t wsrep_commit(THD* const thd)
 {
 #ifdef WSREP_PROC_INFO
   snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
-           "committing %lld", (long long)wsrep_thd_trx_seqno(thd));
+           "Committing %lld", (long long)wsrep_thd_trx_seqno(thd));
   thd_proc_info(thd, thd->wsrep_info);
 #else
-  thd_proc_info(thd, "committing");
+  thd_proc_info(thd, "Committing");
 #endif /* WSREP_PROC_INFO */
 
   wsrep_cb_status_t const rcode(trans_commit(thd) ?
@@ -317,10 +317,10 @@ static wsrep_cb_status_t wsrep_commit(THD* const thd)
 
 #ifdef WSREP_PROC_INFO
   snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
-           "committed %lld", (long long) wsrep_thd_trx_seqno(thd));
+           "Committed %lld", (long long) wsrep_thd_trx_seqno(thd));
   thd_proc_info(thd, thd->wsrep_info);
 #else
-  thd_proc_info(thd, "committed");
+  thd_proc_info(thd, "Committed");
 #endif /* WSREP_PROC_INFO */
 
   return rcode;
@@ -330,10 +330,10 @@ static wsrep_cb_status_t wsrep_rollback(THD* const thd)
 {
 #ifdef WSREP_PROC_INFO
   snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
-           "rolling back %lld", (long long)wsrep_thd_trx_seqno(thd));
+           "Rolling back %lld", (long long)wsrep_thd_trx_seqno(thd));
   thd_proc_info(thd, thd->wsrep_info);
 #else
-  thd_proc_info(thd, "rolling back");
+  thd_proc_info(thd, "Rolling back");
 #endif /* WSREP_PROC_INFO */
 
   wsrep_cb_status_t const rcode(trans_rollback(thd) ?
@@ -341,10 +341,10 @@ static wsrep_cb_status_t wsrep_rollback(THD* const thd)
 
 #ifdef WSREP_PROC_INFO
   snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
-           "rolled back %lld", (long long)wsrep_thd_trx_seqno(thd));
+           "Rolled back %lld", (long long)wsrep_thd_trx_seqno(thd));
   thd_proc_info(thd, thd->wsrep_info);
 #else
-  thd_proc_info(thd, "rolled back");
+  thd_proc_info(thd, "Rolled back");
 #endif /* WSREP_PROC_INFO */
 
   return rcode;
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc
index d047c3580efd1..32544a826e30f 100644
--- a/sql/wsrep_hton.cc
+++ b/sql/wsrep_hton.cc
@@ -383,7 +383,7 @@ wsrep_run_wsrep_commit(THD *thd, bool all)
     mysql_mutex_unlock(&thd->LOCK_wsrep_thd);
 
     mysql_mutex_lock(&thd->mysys_var->mutex);
-    thd_proc_info(thd, "wsrep waiting on replaying");
+    thd_proc_info(thd, "WSREP waiting on replaying");
     thd->mysys_var->current_mutex= &LOCK_wsrep_replaying;
     thd->mysys_var->current_cond=  &COND_wsrep_replaying;
     mysql_mutex_unlock(&thd->mysys_var->mutex);
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc
index 5f29d28b19f76..061ff795fc3c5 100644
--- a/sql/wsrep_thd.cc
+++ b/sql/wsrep_thd.cc
@@ -252,7 +252,7 @@ void wsrep_replay_transaction(THD *thd)
       MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
       thd->m_statement_psi= NULL;
       thd->m_digest= NULL;
-      thd_proc_info(thd, "wsrep replaying trx");
+      thd_proc_info(thd, "WSREP replaying trx");
       WSREP_DEBUG("replay trx: %s %lld",
                   thd->query() ? thd->query() : "void",
                   (long long)wsrep_thd_trx_seqno(thd));
@@ -463,7 +463,7 @@ static void wsrep_rollback_process(THD *thd)
   wsrep_aborting_thd= NULL;
 
   while (thd->killed == NOT_KILLED) {
-    thd_proc_info(thd, "wsrep aborter idle");
+    thd_proc_info(thd, "WSREP aborter idle");
     thd->mysys_var->current_mutex= &LOCK_wsrep_rollback;
     thd->mysys_var->current_cond=  &COND_wsrep_rollback;
 
@@ -472,7 +472,7 @@ static void wsrep_rollback_process(THD *thd)
     WSREP_DEBUG("WSREP rollback thread wakes for signal");
 
     mysql_mutex_lock(&thd->mysys_var->mutex);
-    thd_proc_info(thd, "wsrep aborter active");
+    thd_proc_info(thd, "WSREP aborter active");
     thd->mysys_var->current_mutex= 0;
     thd->mysys_var->current_cond=  0;
     mysql_mutex_unlock(&thd->mysys_var->mutex);
diff --git a/storage/perfschema/pfs_autosize.cc b/storage/perfschema/pfs_autosize.cc
index 6f267cb459959..fd428cd6004ea 100644
--- a/storage/perfschema/pfs_autosize.cc
+++ b/storage/perfschema/pfs_autosize.cc
@@ -124,7 +124,7 @@ PFS_sizing_data small_data=
   /* Account / user / host */
   10, 5, 20,
   /* History sizes */
-  5, 100, 5, 100, 5, 100,
+  10, 100, 10, 100, 10, 100,
   /* Digests */
   1000,
   /* Session connect attrs. */
@@ -140,7 +140,7 @@ PFS_sizing_data medium_data=
   /* Account / user / host */
   100, 100, 100,
   /* History sizes */
-  10, 1000, 10, 1000, 10, 1000,
+  20, 1000, 20, 1000, 20, 1000,
   /* Digests */
   5000,
   /* Session connect attrs. */
@@ -156,7 +156,7 @@ PFS_sizing_data large_data=
   /* Account / user / host */
   100, 100, 100,
   /* History sizes */
-  10, 10000, 10, 10000, 10, 10000,
+  20, 10000, 20, 10000, 20, 10000,
   /* Digests */
   10000,
   /* Session connect attrs. */
diff --git a/storage/perfschema/pfs_server.cc b/storage/perfschema/pfs_server.cc
index 7577154515d99..ee965c0e7daf7 100644
--- a/storage/perfschema/pfs_server.cc
+++ b/storage/perfschema/pfs_server.cc
@@ -67,8 +67,10 @@ initialize_performance_schema(PFS_global_param *param)
       The performance schema is disabled in the startup command line.
       All the instrumentation is turned off.
     */
+    pfs_enabled= 0;
     return NULL;
   }
+  pfs_enabled= TRUE;
 
   init_timers();
 
diff --git a/storage/perfschema/pfs_server.h b/storage/perfschema/pfs_server.h
index bc0c69e86b99d..dd092713d8e7b 100644
--- a/storage/perfschema/pfs_server.h
+++ b/storage/perfschema/pfs_server.h
@@ -49,7 +49,7 @@
   #define PFS_MAX_SETUP_OBJECT 100
 #endif
 #ifndef PFS_MAX_STAGE_CLASS
-  #define PFS_MAX_STAGE_CLASS 150
+  #define PFS_MAX_STAGE_CLASS 160
 #endif
 #ifndef PFS_STATEMENTS_STACK_SIZE
   #define PFS_STATEMENTS_STACK_SIZE 10
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
index dff746fa2809a..1a09412ea083e 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/checkpoint_lock.result
@@ -17,7 +17,7 @@ flush logs;;
 connection conn1;
 select DB, command, state, info from information_schema.processlist where id != connection_id();
 DB	command	state	info
-test	Query	init	flush logs
+test	Query	Init	flush logs
 set tokudb_checkpoint_lock=0;
 connection default;
 disconnect conn1;